Browse Source

Fixed GLM_HAS_OPENMP when OpenMP is not enabled

Christophe Riccio 8 years ago
parent
commit
1e7d12b91b
2 changed files with 4 additions and 1 deletions
  1. 3 1
      glm/detail/setup.hpp
  2. 1 0
      readme.md

+ 3 - 1
glm/detail/setup.hpp

@@ -503,7 +503,9 @@
 #		endif
 #		endif
 #	else
 #	else
 #		define GLM_HAS_OPENMP 0
 #		define GLM_HAS_OPENMP 0
-#	endif// GLM_COMPILER & GLM_COMPILER_VC
+#	endif
+#else
+#	define GLM_HAS_OPENMP 0
 #endif
 #endif
 
 
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////

+ 1 - 0
readme.md

@@ -93,6 +93,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed quat normalize build error #656
 - Fixed quat normalize build error #656
 - Fixed Visual C++ 2017.2 warning regarding __has_feature definision #655
 - Fixed Visual C++ 2017.2 warning regarding __has_feature definision #655
 - Fixed documentation warnings
 - Fixed documentation warnings
+- Fixed GLM_HAS_OPENMP when OpenMP is not enabled
 
 
 #### Deprecation:
 #### Deprecation:
 - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler
 - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler