From 1e7d12b91bcce3ebc3d4f62ff1b9d12ba3908c2a Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 7 Aug 2017 01:28:42 +0200 Subject: [PATCH] Fixed GLM_HAS_OPENMP when OpenMP is not enabled --- glm/detail/setup.hpp | 4 +++- readme.md | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 20ab1223..1e8236b1 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -503,7 +503,9 @@ # endif # else # define GLM_HAS_OPENMP 0 -# endif// GLM_COMPILER & GLM_COMPILER_VC +# endif +#else +# define GLM_HAS_OPENMP 0 #endif /////////////////////////////////////////////////////////////////////////////////// diff --git a/readme.md b/readme.md index ae471f5d..d142adac 100644 --- a/readme.md +++ b/readme.md @@ -93,6 +93,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) - Fixed quat normalize build error #656 - Fixed Visual C++ 2017.2 warning regarding __has_feature definision #655 - Fixed documentation warnings +- Fixed GLM_HAS_OPENMP when OpenMP is not enabled #### Deprecation: - Requires Visual Studio 2013, GCC 4.7, Clang 3.4, Cuda 7, ICC 2013 or a C++11 compiler