diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 077bf0b8..e455a43b 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -575,7 +575,7 @@ # define GLM_MSC_EXT GLM_LANG_CXXMS_FLAG # else # define GLM_MSC_EXT 0 -# endif +# endif # if __cplusplus >= 201402L # define GLM_LANG (GLM_LANG_CXX14 | GLM_MSC_EXT) # elif __cplusplus >= 201103L diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp index d35b4c54..3bce7081 100644 --- a/glm/gtx/intersect.hpp +++ b/glm/gtx/intersect.hpp @@ -43,8 +43,12 @@ #pragma once // Dependency: +#include +#include #include "../glm.hpp" +#include "../geometric.hpp" #include "../gtx/closest_point.hpp" +#include "../gtx/vector_query.hpp" #if(defined(GLM_MESSAGES) && !defined(GLM_EXT_INCLUDED)) # pragma message("GLM: GLM_GTX_closest_point extension included") diff --git a/glm/gtx/intersect.inl b/glm/gtx/intersect.inl index 6b94d5bc..ac6304e0 100644 --- a/glm/gtx/intersect.inl +++ b/glm/gtx/intersect.inl @@ -7,10 +7,6 @@ // File : glm/gtx/intersect.inl /////////////////////////////////////////////////////////////////////////////////////////////////// -#include "../geometric.hpp" -#include -#include - namespace glm { template diff --git a/readme.md b/readme.md index 649c25fb..cb8a0337 100644 --- a/readme.md +++ b/readme.md @@ -64,19 +64,22 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ##### Improvements: - Improved GTC_random linearRand documentation - Improved GTC_reciprocal documentation -- Added unary + operator #435 ##### Fixes: - Fixed GTX_extended_min_max filename typo #386 - Fixed intersectRayTriangle to not do any unintentional backface culling -- Fixed ldexp and frexp compilation errors -- Fixed ICC on Linux build errors #449 -#### [GLM 0.9.7.2](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX +#### [GLM 0.9.7.2](https://github.com/g-truc/glm/tree/0.9.7) - 2016-01-XX ##### Fixes: - Fixed GTC_round floorMultiple/ceilMultiple #412 - Fixed GTC_packing unpackUnorm3x10_1x2 #414 - Fixed GTC_matrix_inverse affineInverse #192 +- Fixed ICC on Linux build errors #449 +- Fixed ldexp and frexp compilation errors +- Fixed "Declaration shadows a field" warning #468 +- Fixed 'GLM_COMPILER_VC2005 is not defined' warning #468 +- Fixed various 'X is not defined' warnings #468 +- Fixed missing unary + operator #435 - Fixed Cygwin build errors when using C++11 #405 #### [GLM 0.9.7.1](https://github.com/g-truc/glm/releases/tag/0.9.7.1) - 2015-09-07