Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Revert, to reduce risks of regressions

Christophe Riccio 9 years ago
parent
2087606611
commit
07baa3b45a
1 changed files with 3 additions and 1 deletions
Unified View Show Diff Stats
  1. 3 1
      glm/detail/setup.hpp

+ 3 - 1
glm/detail/setup.hpp
View File 

@@ -681,7 +681,9 @@
 
 // http://gcc.gnu.org/projects/cxx0x.html
 
 // http://gcc.gnu.org/projects/cxx0x.html
 
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
 // http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
 
 
 
-#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
 
+#if GLM_PLATFORM == GLM_PLATFORM_ANDROID || GLM_PLATFORM == GLM_PLATFORM_CYGWIN
 
+#	define GLM_HAS_CXX11_STL 0
 
+#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
 
 #	if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG
 
 #	if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG
 
 #		define GLM_HAS_CXX11_STL 1
 
 #		define GLM_HAS_CXX11_STL 1
 
 #	else
 
 #	else