diff --git a/CMakeLists.txt b/CMakeLists.txt index cad4fafb32..49ae1e067c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,8 @@ cmake_minimum_required (VERSION 2.8) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/") project (hifi) +set (GLM_ROOT_DIR "${CMAKE_SOURCE_DIR}/thirdparty") + add_subdirectory (interface) \ No newline at end of file diff --git a/cmake/modules/FindGLM.cmake b/cmake/modules/FindGLM.cmake new file mode 100755 index 0000000000..2d9009298f --- /dev/null +++ b/cmake/modules/FindGLM.cmake @@ -0,0 +1,63 @@ +# FindGLM - attempts to locate the glm matrix/vector library. +# +# This module defines the following variables (on success): +# GLM_INCLUDE_DIRS - where to find glm/glm.hpp +# GLM_FOUND - if the library was successfully located +# +# It is trying a few standard installation locations, but can be customized +# with the following variables: +# GLM_ROOT_DIR - root directory of a glm installation +# Headers are expected to be found in either: +# /glm/glm.hpp OR +# /include/glm/glm.hpp +# This variable can either be a cmake or environment +# variable. Note however that changing the value +# of the environment varible will NOT result in +# re-running the header search and therefore NOT +# adjust the variables set by this module. + +#============================================================================= +# Copyright 2012 Carsten Neumann +# +# Distributed under the OSI-approved BSD License (the "License"); +# see accompanying file Copyright.txt for details. +# +# This software is distributed WITHOUT ANY WARRANTY; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# See the License for more information. +#============================================================================= +# (To distribute this file outside of CMake, substitute the full +# License text for the above reference.) + +# default search dirs +SET(_glm_HEADER_SEARCH_DIRS + "/usr/include" + "/usr/local/include") + +# check environment variable +SET(_glm_ENV_ROOT_DIR "$ENV{GLM_ROOT_DIR}") + +IF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) + SET(GLM_ROOT_DIR "${_glm_ENV_ROOT_DIR}") +ENDIF(NOT GLM_ROOT_DIR AND _glm_ENV_ROOT_DIR) + +# put user specified location at beginning of search +IF(GLM_ROOT_DIR) + SET(_glm_HEADER_SEARCH_DIRS "${GLM_ROOT_DIR}" + "${GLM_ROOT_DIR}/include" + ${_glm_HEADER_SEARCH_DIRS}) +ENDIF(GLM_ROOT_DIR) + +# locate header +FIND_PATH(GLM_INCLUDE_DIR "glm/glm.hpp" + PATHS ${_glm_HEADER_SEARCH_DIRS}) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GLM DEFAULT_MSG + GLM_INCLUDE_DIR) + +IF(GLM_FOUND) + SET(GLM_INCLUDE_DIRS "${GLM_INCLUDE_DIR}") + + MESSAGE(STATUS "GLM_INCLUDE_DIR = ${GLM_INCLUDE_DIR}") +ENDIF(GLM_FOUND) diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 1f88e309d9..e14f14ac5c 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -1,11 +1,10 @@ cmake_minimum_required (VERSION 2.8) project (interface) -add_subdirectory (src) +file (GLOB INTERFACE_SRCS src/*.cpp src/*.h) -# third party libraries -find_package (Portaudio REQUIRED) -include_directories (${Portaudio_INCLUDE_DIRS}) -set (LIBS ${LIBS} ${Portaudio_LIBRARIES}) +add_executable (interface ${INTERFACE_SRCS}) -target_link_libraries (interface LIBS) \ No newline at end of file +find_package (GLM REQUIRED) +include_directories (${GLM_INCLUDE_DIRS}) +target_link_libraries (interface GLM) \ No newline at end of file diff --git a/interface/src/Agent.h b/interface/src/Agent.h index 712a42ec41..27f355c9ec 100644 --- a/interface/src/Agent.h +++ b/interface/src/Agent.h @@ -9,7 +9,7 @@ #ifndef __interface__Agent__ #define __interface__Agent__ -#include "glm.hpp" +#include #include #include #include diff --git a/interface/src/AudioSource.h b/interface/src/AudioSource.h index adb68c3df4..1485d90bae 100644 --- a/interface/src/AudioSource.h +++ b/interface/src/AudioSource.h @@ -10,7 +10,7 @@ #define __interface__AudioSource__ #include -#include "glm.hpp" +#include class AudioSource { public: diff --git a/interface/src/CMakeLists.txt b/interface/src/CMakeLists.txt deleted file mode 100644 index 52703ea311..0000000000 --- a/interface/src/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -file (GLOB INTERFACE_SRCS *.cpp *.h) -add_executable (interface ${INTERFACE_SRCS}) \ No newline at end of file diff --git a/interface/src/Cube.h b/interface/src/Cube.h index 7952c1bbc9..405c7c0f6f 100644 --- a/interface/src/Cube.h +++ b/interface/src/Cube.h @@ -9,7 +9,7 @@ #ifndef __interface__Cube__ #define __interface__Cube__ -#include "glm.hpp" +#include #include "Util.h" #include "world.h" #include diff --git a/interface/src/Field.cpp b/interface/src/Field.cpp index 74f357bdc6..2793d8de5d 100644 --- a/interface/src/Field.cpp +++ b/interface/src/Field.cpp @@ -7,7 +7,7 @@ // #include "Field.h" -#include "glm.hpp" +#include #define FIELD_SCALE 0.00050 #define COLOR_DRIFT_RATE 0.001f // per-frame drift of particle color towards field element color #define COLOR_MIN 0.2f // minimum R/G/B value at 0,0,0 - also needs setting in cloud.cpp diff --git a/interface/src/Field.h b/interface/src/Field.h index 9c13646fdb..76aaab5420 100644 --- a/interface/src/Field.h +++ b/interface/src/Field.h @@ -17,7 +17,7 @@ #include #include "world.h" #include "Util.h" -#include "glm.hpp" +#include // Field is a lattice of vectors uniformly distributed FIELD_ELEMENTS^(1/3) on side const int FIELD_ELEMENTS = 1000; diff --git a/interface/src/Finger.h b/interface/src/Finger.h index e172401fa5..7e1d15742a 100644 --- a/interface/src/Finger.h +++ b/interface/src/Finger.h @@ -9,7 +9,7 @@ #ifndef __interface__Finger__ #define __interface__Finger__ -#include "glm.hpp" +#include #include "Util.h" #include "world.h" #include diff --git a/interface/src/Hand.h b/interface/src/Hand.h index a7d0af46b4..448bf7823a 100644 --- a/interface/src/Hand.h +++ b/interface/src/Hand.h @@ -9,7 +9,7 @@ #ifndef __interface__Hand__ #define __interface__Hand__ -#include "glm.hpp" +#include #include #include "Util.h" #include "Field.h" diff --git a/interface/src/Lattice.h b/interface/src/Lattice.h index 4b3ca02319..4099f1488c 100644 --- a/interface/src/Lattice.h +++ b/interface/src/Lattice.h @@ -9,7 +9,7 @@ #ifndef __interface__Lattice__ #define __interface__Lattice__ -#include "glm.hpp" +#include #include "Util.h" #include "world.h" #include diff --git a/interface/src/Oscilloscope.h b/interface/src/Oscilloscope.h index 9dfe051011..d4ce9f04c5 100644 --- a/interface/src/Oscilloscope.h +++ b/interface/src/Oscilloscope.h @@ -9,7 +9,7 @@ #ifndef __interface__Oscilloscope__ #define __interface__Oscilloscope__ -#include "glm.hpp" +#include #include "Util.h" #include "World.h" #include diff --git a/interface/src/Particle.h b/interface/src/Particle.h index 17c831258d..b3b1895013 100644 --- a/interface/src/Particle.h +++ b/interface/src/Particle.h @@ -9,7 +9,7 @@ #ifndef __interface__Particle__ #define __interface__Particle__ -#include "glm.hpp" +#include #include "Util.h" #include "world.h" #include diff --git a/interface/src/SerialInterface.h b/interface/src/SerialInterface.h index 82d35f85d7..e8d3ec9412 100644 --- a/interface/src/SerialInterface.h +++ b/interface/src/SerialInterface.h @@ -6,7 +6,7 @@ #ifndef __interface__SerialInterface__ #define __interface__SerialInterface__ -#include "glm.hpp" +#include #include "util.h" #include "world.h" #include diff --git a/interface/src/Util.cpp b/interface/src/Util.cpp index cb10d72667..80d299b577 100644 --- a/interface/src/Util.cpp +++ b/interface/src/Util.cpp @@ -13,7 +13,7 @@ #endif #include #include "world.h" -#include "glm.hpp" +#include #include "util.h" diff --git a/interface/src/Util.h b/interface/src/Util.h index 4723bd17fa..de5fe6c8dd 100644 --- a/interface/src/Util.h +++ b/interface/src/Util.h @@ -9,7 +9,7 @@ #ifndef __interface__Util__ #define __interface__Util__ -#include "glm.hpp" +#include float azimuth_to(glm::vec3 head_pos, glm::vec3 source_pos); float angle_to(glm::vec3 head_pos, glm::vec3 source_pos, float render_yaw, float head_yaw); diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 5380a5fdd8..838a394b1b 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -36,7 +36,7 @@ #include #include #include -#include "glm.hpp" +#include #include "portaudio.h" // Bring in OpenCV diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.d b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.d new file mode 100644 index 0000000000..55b93450bf --- /dev/null +++ b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.d @@ -0,0 +1,199 @@ +dependencies: \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../glm.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/_fixes.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/_detail.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/type.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_half.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_half.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_float.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_int.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_gentype.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_size.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec1.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/_swizzle.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/_swizzle_func.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec1.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec3.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec3.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec4.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_vec4.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x3.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x3.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x4.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat2x4.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x3.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x3.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x4.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat3x4.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x3.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x3.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x4.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/type_mat4x4.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_trigonometric.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_trigonometric.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/_vectorize.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_exponential.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_exponential.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_common.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_common.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_packing.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_packing.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_geometric.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_geometric.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_matrix.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_matrix.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_vector_relational.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_vector_relational.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_integer.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_integer.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././core/func_noise.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/func_noise.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../ext.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/half_float.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/half_float.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_access.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_access.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_integer.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_inverse.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_inverse.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_transform.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/matrix_transform.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/quaternion.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/quaternion.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/swizzle.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/../gtc/type_precision.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/type_precision.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/swizzle.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/type_ptr.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/type_ptr.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/associated_min_max.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/associated_min_max.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/bit.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/bit.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/closest_point.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/closest_point.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_cast.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/number_precision.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/number_precision.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_cast.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_space.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_space.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_space_YCoCg.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/color_space_YCoCg.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/compatibility.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/compatibility.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/component_wise.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/component_wise.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/epsilon.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/epsilon.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/euler_angles.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/euler_angles.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/extend.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/extend.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/extented_min_max.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/extented_min_max.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_exponential.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_exponential.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_square_root.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_square_root.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_trigonometry.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/fast_trigonometry.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/gradient_paint.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/optimum_pow.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/optimum_pow.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/gradient_paint.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/handed_coordinate_space.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/handed_coordinate_space.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/inertia.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/inertia.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/int_10_10_10_2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/raw_data.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/raw_data.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/int_10_10_10_2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/integer.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/integer.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/intersect.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/intersect.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/log_base.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/log_base.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_cross_product.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_cross_product.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_interpolation.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_interpolation.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_major_storage.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_major_storage.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_operation.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_operation.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_query.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/vector_query.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vector_query.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/matrix_query.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/mixed_product.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/mixed_product.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/multiple.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/multiple.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/noise.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtc/noise.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/noise.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/noise.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/norm.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/quaternion.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/quaternion.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/norm.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/normal.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/normal.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/normalize_dot.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/normalize_dot.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/ocl_type.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/ocl_type.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/orthonormalize.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/orthonormalize.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/perpendicular.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/projection.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/projection.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/perpendicular.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/polar_coordinates.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/polar_coordinates.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/random.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtc/random.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtc/random.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/random.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/reciprocal.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/reciprocal.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/rotate_vector.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/../gtx/transform.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/transform.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/rotate_vector.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/spline.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/spline.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/std_based_type.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/std_based_type.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/string_cast.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/string_cast.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/transform2.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/transform2.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/ulp.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/ulp.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vec1.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vec1.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vector_access.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vector_access.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vector_angle.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/vector_angle.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/verbose_operator.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/verbose_operator.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/wrap.hpp \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././gtx/wrap.inl \ + /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/.././virtrev/xstream.hpp diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.dia b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.dia new file mode 100644 index 0000000000..3865b8d21b Binary files /dev/null and b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.dia differ diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o new file mode 100644 index 0000000000..a3b1c720a4 Binary files /dev/null and b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o differ diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/glm.LinkFileList b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/glm.LinkFileList new file mode 100644 index 0000000000..a112dbf332 --- /dev/null +++ b/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/glm.LinkFileList @@ -0,0 +1 @@ +/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/Script-82940E848B4C4A3D899023FC.sh b/interface/thirdparty/glm/interface.build/Debug/glm.build/Script-82940E848B4C4A3D899023FC.sh new file mode 100755 index 0000000000..6c698952b9 --- /dev/null +++ b/interface/thirdparty/glm/interface.build/Debug/glm.build/Script-82940E848B4C4A3D899023FC.sh @@ -0,0 +1,2 @@ +#!/bin/sh +make -C /Users/birarda/code/worklist/interface/interface/thirdparty/glm -f /Users/birarda/code/worklist/interface/interface/thirdparty/glm/CMakeScripts/glm_postBuildPhase.make$CONFIGURATION all diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/build-state.dat b/interface/thirdparty/glm/interface.build/Debug/glm.build/build-state.dat new file mode 100644 index 0000000000..c8a128ffbf --- /dev/null +++ b/interface/thirdparty/glm/interface.build/Debug/glm.build/build-state.dat @@ -0,0 +1,104 @@ +Tglm +v5 +r1 +cCheck dependencies +cCompileC thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler + +N/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk +c000000005106ECFD00000000000000AA +t1359408381 +s170 + +N/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp +c0000000050FF003000000000000006BB +t1358889008 +s1723 +i"../glm.hpp" +i"../ext.hpp" + +N/Users/birarda/code/worklist/interface/interface/thirdparty/glm/Debug/glm +t2 +s0 + +N/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o +t2 +s0 + +N/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/glm.LinkFileList +c000000005113F3BC000000000000007E +t1360262076 +s126 + +N/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Script-82940E848B4C4A3D899023FC.sh +c000000005113F3BC00000000000000CC +t1360262076 +s204 + +N/Users/birarda/code/worklist/interface/thirdparty/glm/ext.hpp +c0000000050FF00300000000000001544 +t1358889008 +s5444 + +N/Users/birarda/code/worklist/interface/thirdparty/glm/glm.hpp +c0000000050FF08000000000000001608 +t1358891008 +s5640 + +CBuild AST from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp +r0 + +CCheck dependencies +r0 +lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection18"Check dependencies3dd7c33c2bc4b641^3e07d23c2bc4b641^---0#1#0#--18"Check dependencies36"C1478C1C-913A-4493-A506-14E99A43FEBA- + +CCompileC thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler +s381954877.472677 +e381954878.629004 +r1 +xCompileC +xthirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o +x/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp +xnormal +xx86_64 +xc++ +xcom.apple.compilers.llvm.clang.1_0.compiler +oIn file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:33: +oIn file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../glm.hpp:89: +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:82:11: warning: GLM: Apple platform detected [-W#pragma-messages] +o# pragma message("GLM: Apple platform detected") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:367:11: warning: GLM: Clang compiler detected [-W#pragma-messages] +o# pragma message("GLM: Clang compiler detected") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:405:11: warning: GLM: 64 bits model [-W#pragma-messages] +o# pragma message("GLM: 64 bits model") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:454:11: warning: GLM: C++98 [-W#pragma-messages] +o# pragma message("GLM: C++98") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:551:11: warning: GLM: Platform independent [-W#pragma-messages] +o# pragma message("GLM: Platform independent") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:601:11: warning: GLM: x,y,z,w; r,g,b,a; s,t,p,q component names except of half based vector types [-W#pragma-messages] +o# pragma message("GLM: x,y,z,w; r,g,b,a; s,t,p,q component names except of half based vector types") +o ^ +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:671:11: warning: GLM: Swizzling operators disabled [-W#pragma-messages] +o# pragma message("GLM: Swizzling operators disabled") +o ^ +oIn file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:33: +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../glm.hpp:93:10: warning: GLM: Core library included [-W#pragma-messages] +o# pragma message("GLM: Core library included") +o ^ +oIn file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:34: +o/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../ext.hpp:63:10: warning: GLM: All extensions included (not recommanded) [-W#pragma-messages] +o# pragma message("GLM: All extensions included (not recommanded)") +o ^ +o9 warnings generated. +lSLF05#21%IDEActivityLogSection1@2#32"com.apple.dt.IDE.BuildLogSection89"Compile /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp3d27793d2bc4b641^840fa13e2bc4b641^-2695"In file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:33: In file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../glm.hpp:89: /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:82:11: warning: GLM: Apple platform detected [-W#pragma-messages] # pragma message("GLM: Apple platform detected") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:367:11: warning: GLM: Clang compiler detected [-W#pragma-messages] # pragma message("GLM: Clang compiler detected") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:405:11: warning: GLM: 64 bits model [-W#pragma-messages] # pragma message("GLM: 64 bits model") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:454:11: warning: GLM: C++98 [-W#pragma-messages] # pragma message("GLM: C++98") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:551:11: warning: GLM: Platform independent [-W#pragma-messages] # pragma message("GLM: Platform independent") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:601:11: warning: GLM: x,y,z,w; r,g,b,a; s,t,p,q component names except of half based vector types [-W#pragma-messages] # pragma message("GLM: x,y,z,w; r,g,b,a; s,t,p,q component names except of half based vector types") ^ /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../core/setup.hpp:671:11: warning: GLM: Swizzling operators disabled [-W#pragma-messages] # pragma message("GLM: Swizzling operators disabled") ^ In file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:33: /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../glm.hpp:93:10: warning: GLM: Core library included [-W#pragma-messages] # pragma message("GLM: Core library included") ^ In file included from /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp:34: /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/../ext.hpp:63:10: warning: GLM: All extensions included (not recommanded) [-W#pragma-messages] # pragma message("GLM: All extensions included (not recommanded)") ^ 9 warnings generated. -0#0#0#-19%DVTDocumentLocation2@97"file://localhost/Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp0000000000000000^2248"CompileC thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o ../thirdparty/glm/core/dummy.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler cd /Users/birarda/code/worklist/interface/interface setenv LANG en_US.US-ASCII /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wformat -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-enum-conversion -Wno-shorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions "-DCMAKE_INTDIR=\"Debug\"" -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.8 -g -Wno-sign-conversion -I/Users/birarda/code/worklist/interface/interface/thirdparty/glm/Debug/include -I/Users/birarda/code/worklist/interface/thirdparty/glm/.. -I/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/DerivedSources/x86_64 -I/Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/DerivedSources -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -F/Users/birarda/code/worklist/interface/interface/thirdparty/glm/Debug -MMD -MT dependencies -MF /Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.d --serialize-diagnostics /Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.dia -c /Users/birarda/code/worklist/interface/interface/../thirdparty/glm/core/dummy.cpp -o /Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o 36"43DCAA56-C692-491D-999F-99CA1695D739- + +CLd /Users/birarda/code/worklist/interface/interface/thirdparty/glm/Debug/glm normal x86_64 +r0 + +CPhaseScriptExecution "CMake PostBuild Rules" /Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Script-82940E848B4C4A3D899023FC.sh +r0 + diff --git a/interface/thirdparty/glm/interface.build/Debug/glm.build/glm.dep b/interface/thirdparty/glm/interface.build/Debug/glm.build/glm.dep new file mode 100644 index 0000000000..4bf4b94253 --- /dev/null +++ b/interface/thirdparty/glm/interface.build/Debug/glm.build/glm.dep @@ -0,0 +1,2 @@ +ffffffffffffffffffffffffffffffff a66b8de01ddf104f76f12b865bb39835 ffffffffffffffffffffffffffffffff 0 /Users/birarda/code/worklist/interface/interface/thirdparty/glm/interface.build/Debug/glm.build/Objects-normal/x86_64/dummy.o +ffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffff ffffffffffffffffffffffffffffffff 0 /Users/birarda/code/worklist/interface/interface/thirdparty/glm/Debug/glm