Fixed merge

ago%!(EXTRA string=12 years) · 5f0c0a6f21
parent 9f1e0cd388 4688f896f9
commit 5f0c0a6f21
2 changed files with 12 additions and 2 deletions
--- 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__)) 
+#	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)
--- 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
 --------------------------------------------------------------------------------