From 106fd19704548bb1564f5fcf2f70c905985f14fd Mon Sep 17 00:00:00 2001 From: Bob Kuehne Date: Thu, 13 Jun 2013 11:33:33 -0400 Subject: [PATCH] fix for gnu compiler version detection --- glm/core/setup.hpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index d1d63e03..e3ac8902 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -32,11 +32,11 @@ /////////////////////////////////////////////////////////////////////////////////////////////////// // Version -#define GLM_VERSION 94 +#define GLM_VERSION 94 #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 4 -#define GLM_VERSION_REVISION 4 +#define GLM_VERSION_REVISION 4 /////////////////////////////////////////////////////////////////////////////////////////////////// // Platform @@ -434,6 +434,12 @@ #else # if(__cplusplus >= 201103L) # define GLM_LANG GLM_LANG_CXX11 +# 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_GCC) == GLM_COMPILER_GCC) && defined(__GXX_EXPERIMENTAL_CXX0X__)) # define GLM_LANG GLM_LANG_CXX0X # elif(((GLM_COMPILER & GLM_COMPILER_VC) == GLM_COMPILER_VC) && defined(_MSC_EXTENSIONS))