Home Explore Help
Sign In
cpp
/
glm
mirror of https://github.com/g-truc/glm.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.4

Christophe Riccio 12 years ago
parent
caf8f991ca 4570daf7d2
commit
eb07c880c3
2 changed files with 6 additions and 2 deletions
Split View Show Diff Stats
  1. 3 1
      glm/core/setup.hpp
  2. 3 1
      readme.txt

+ 3 - 1
glm/core/setup.hpp
View File 

@@ -496,7 +496,9 @@
 
 #elif(defined(GLM_FORCE_SSE2))
 
 #	define GLM_ARCH (GLM_ARCH_SSE2)
 
 #elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64)))
 
-#	if(defined(_M_CEE_PURE))
 
+#	if(GLM_PLATFORM == GLM_PLATFORM_WINCE)
 
+#		define GLM_ARCH GLM_ARCH_PURE
 
+#	elif(defined(_M_CEE_PURE))
 
 #		define GLM_ARCH GLM_ARCH_PURE
 
 /* TODO: Explore auto detection of instruction set support
 
 #	elif(defined(_M_IX86_FP))

+ 3 - 1
readme.txt
View File 

@@ -48,8 +48,10 @@ GLM 0.9.4.5: 2013-08-12
 
 - Fixed CUDA support
 
 - Fixed inclusion of intrinsics in "pure" mode #92
 
 - Fixed language detection on GCC when the C++0x mode isn't enabled #95
 
+- Fixed issue #97: register is deprecated in C++11
 
+- Fixed issue #96: CUDA issues
 
+- Added Windows CE detection #92
 
 - Added missing value_ptr for quaternions #99
 
-- Added WINCE detection #92
 
 
 ================================================================================
 
 GLM 0.9.4.4: 2013-05-29