Fixed Android build issue, STL C++11 is not supported by the NDK #284

g-truc · Dec 8, 2014 · 459fe3a · 459fe3a
1 parent c1180c8
commit 459fe3a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp
@@ -453,11 +453,17 @@
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
 // N1720
+/*
 #if GLM_COMPILER & GLM_COMPILER_CLANG
 #	define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX11_FLAG) && __has_include(<__config>)
 #else
 #	define GLM_HAS_CXX11_STL (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015)
 #endif
+*/
+#define GLM_HAS_CXX11_STL ((GLM_PLATFORM != GLM_PLATFORM_ANDROID) && (\
+	(GLM_LANG & GLM_LANG_CXX11_FLAG) || \
+	((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \
+	((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2015))))
 
 // N1720
 #define GLM_HAS_STATIC_ASSERT ( \

diff --git a/readme.txt b/readme.txt
@@ -69,6 +69,7 @@ Fixes:
 - Fixed scalar uaddCarry build error with Cuda #276
 - Fixed C++11 explicit conversion operators detection #282
 - Fixed missing explicit convertion when using integer log2 with *vec1 types
+- Fixed Android build issue, STL C++11 is not supported by the NDK #284
 
 ================================================================================
 GLM 0.9.6.0: 2014-11-30