From d0e382592a1fcc0b920f3630e4b7ccea0ccf3e1b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 19:53:03 +0200 Subject: [PATCH] Fixed C++0X on VisualC++ 2012+ --- glm/core/setup.hpp | 4 ++-- readme.txt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 798720a5..f4e013c0 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -453,11 +453,11 @@ # elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS)) # define GLM_LANG GLM_LANG_CXXMS # elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && !defined(_MSC_EXTENSIONS)) -# if(GLM_COMPILER == GLM_COMPILER_VC2010) +# if(GLM_COMPILER >= GLM_COMPILER_VC2010) # define GLM_LANG GLM_LANG_CXX0X # else # define GLM_LANG GLM_LANG_CXX98 -# endif//(GLM_COMPILER == GLM_COMPILER_VC2010) +# endif # elif(__cplusplus >= 199711L) # define GLM_LANG GLM_LANG_CXX98 # else diff --git a/readme.txt b/readme.txt index 6fcb28aa..165708c2 100644 --- a/readme.txt +++ b/readme.txt @@ -36,6 +36,11 @@ 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.4.6: 2013-XX-XX +-------------------------------------------------------------------------------- + + ================================================================================ GLM 0.9.4.5: 2013-08-12 --------------------------------------------------------------------------------