Browse Source

Fixed Android doesn't have C++ 11 STL #284

Christophe Riccio 10 years ago
parent
commit
9a8cffd83a
2 changed files with 7 additions and 1 deletions
  1. 1 1
      glm/detail/setup.hpp
  2. 6 0
      readme.txt

+ 1 - 1
glm/detail/setup.hpp

@@ -500,7 +500,7 @@
 // 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_PLATFORM != GLM_PLATFORM_ANDROID
+#if GLM_PLATFORM == GLM_PLATFORM_ANDROID
 #	define GLM_HAS_CXX11_STL 0
 #	define GLM_HAS_CXX11_STL 0
 #elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
 #elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
 #	define GLM_HAS_CXX11_STL __has_include(<__config>)
 #	define GLM_HAS_CXX11_STL __has_include(<__config>)

+ 6 - 0
readme.txt

@@ -63,6 +63,12 @@ GLM is a header only library, there is nothing to build, just include it.
 More informations in GLM manual:
 More informations in GLM manual:
 http://glm.g-truc.net/glm.pdf
 http://glm.g-truc.net/glm.pdf
 
 
+================================================================================
+GLM 0.9.6.3: 2015-0X-XX
+--------------------------------------------------------------------------------
+Fixes:
+- Fixed Android doesn't have C++ 11 STL #284
+
 ================================================================================
 ================================================================================
 GLM 0.9.6.2: 2015-02-15
 GLM 0.9.6.2: 2015-02-15
 --------------------------------------------------------------------------------
 --------------------------------------------------------------------------------