Fixed Intel compiler build error on Linux #354

g-truc · Jul 19, 2015 · 9e2f6df · 9e2f6df
1 parent 1e0cf75
commit 9e2f6df
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -537,12 +537,13 @@
 
 #if GLM_PLATFORM == GLM_PLATFORM_ANDROID
 #	define GLM_HAS_CXX11_STL 0
-#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG | GLM_COMPILER_INTEL)
+#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
 #	define GLM_HAS_CXX11_STL __has_include("__config")
 #else
 #	define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && \
 		((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \
-		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)))
+		((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
+		((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15)))
 #endif
 
 // N1720

diff --git a/readme.md b/readme.md
@@ -76,6 +76,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 - Fixed perspective fovy argument documentation #327
 - Removed -m64 causing build issues on Linux 32 #331
 - Fixed isfinite with C++98 compilers #343
+- Fixed Intel compiler build error on Linux #354
 
 ##### Deprecation:
 - Removed integer specification for 'mod' in GTC_integer #308