Browse Source

Fixed C++0X on VisualC++ 2012+

Christophe Riccio 12 years ago
parent
commit
d0e382592a
2 changed files with 7 additions and 2 deletions
  1. 2 2
      glm/core/setup.hpp
  2. 5 0
      readme.txt

+ 2 - 2
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

+ 5 - 0
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
 --------------------------------------------------------------------------------