From 9a8cffd83ac7245baaa83722d627aab8077c9b9e Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 15 Feb 2015 15:33:14 +0100 Subject: [PATCH] Fixed Android doesn't have C++ 11 STL #284 --- glm/detail/setup.hpp | 2 +- readme.txt | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 730cb7a7..e624d2bb 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -500,7 +500,7 @@ // http://gcc.gnu.org/projects/cxx0x.html // 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 #elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) # define GLM_HAS_CXX11_STL __has_include(<__config>) diff --git a/readme.txt b/readme.txt index cb5d6273..0f758711 100644 --- a/readme.txt +++ b/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: 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 --------------------------------------------------------------------------------