diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 4767fa1b..dcb43b40 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -447,8 +447,12 @@ # if(__cplusplus >= 201103L) # define GLM_LANG GLM_LANG_CXX11 // -std=c++0x or -std=gnu++0x -# elif(((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) -# define GLM_LANG GLM_LANG_CXX0X +# elif((GLM_COMPILER & GLM_COMPILER_GCC) == GLM_COMPILER_GCC) +# if defined(__GXX_EXPERIMENTAL_CXX0X__) +# define GLM_LANG GLM_LANG_CXX0X +# else +# define GLM_LANG GLM_LANG_CXX98 +# endif # elif(GLM_COMPILER & GLM_COMPILER_VC) # if(defined(_MSC_EXTENSIONS)) # if(GLM_COMPILER >= GLM_COMPILER_VC2012) diff --git a/readme.txt b/readme.txt index 899aed5b..3ecc52f1 100644 --- a/readme.txt +++ b/readme.txt @@ -52,6 +52,12 @@ GLM 0.9.5.0: 2013-XX-XX - Fixed post increment and decrement operators - Fixed perspective with zNear == 0 (#71) +================================================================================ +GLM 0.9.4.5: 2013-06-XX +-------------------------------------------------------------------------------- +- Fixed inclusion of intrinsics in "pure" mode #92 +- Fixed language detection on GCC when the C++0x mode isn't enabled #95 + ================================================================================ GLM 0.9.4.4: 2013-05-29 --------------------------------------------------------------------------------