Browse Source

Added WINCE detection

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

+ 6 - 1
glm/core/setup.hpp

@@ -50,6 +50,7 @@
 #define GLM_PLATFORM_CHROME_NACL	0x00200000
 #define GLM_PLATFORM_CHROME_NACL	0x00200000
 #define GLM_PLATFORM_UNIX			0x00400000
 #define GLM_PLATFORM_UNIX			0x00400000
 #define GLM_PLATFORM_QNXNTO			0x00800000
 #define GLM_PLATFORM_QNXNTO			0x00800000
+#define GLM_PLATFORM_WINCE			0x01000000
 
 
 #ifdef GLM_FORCE_PLATFORM_UNKNOWN
 #ifdef GLM_FORCE_PLATFORM_UNKNOWN
 #	define GLM_PLATFORM GLM_PLATFORM_UNKNOWN
 #	define GLM_PLATFORM GLM_PLATFORM_UNKNOWN
@@ -57,6 +58,8 @@
 #	define GLM_PLATFORM GLM_PLATFORM_QNXNTO
 #	define GLM_PLATFORM GLM_PLATFORM_QNXNTO
 #elif defined(__APPLE__)
 #elif defined(__APPLE__)
 #	define GLM_PLATFORM GLM_PLATFORM_APPLE
 #	define GLM_PLATFORM GLM_PLATFORM_APPLE
+#elif defined(WINCE)
+#	define GLM_PLATFORM GLM_PLATFORM_WINCE
 #elif defined(_WIN32)
 #elif defined(_WIN32)
 #	define GLM_PLATFORM GLM_PLATFORM_WINDOWS
 #	define GLM_PLATFORM GLM_PLATFORM_WINDOWS
 #elif defined(__native_client__)
 #elif defined(__native_client__)
@@ -499,7 +502,9 @@
 #elif(defined(GLM_FORCE_SSE2))
 #elif(defined(GLM_FORCE_SSE2))
 #	define GLM_ARCH (GLM_ARCH_SSE2)
 #	define GLM_ARCH (GLM_ARCH_SSE2)
 #elif((GLM_COMPILER & GLM_COMPILER_VC) && (defined(_M_IX86) || defined(_M_X64)))
 #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
 #		define GLM_ARCH GLM_ARCH_PURE
 /* TODO: Explore auto detection of instruction set support
 /* TODO: Explore auto detection of instruction set support
 #	elif(defined(_M_IX86_FP))
 #	elif(defined(_M_IX86_FP))

+ 2 - 0
readme.txt

@@ -42,6 +42,8 @@ GLM 0.9.4.5: 2013-07-XX
 - Fixed inclusion of intrinsics in "pure" mode #92 
 - Fixed inclusion of intrinsics in "pure" mode #92 
 - Fixed language detection on GCC when the C++0x mode isn't enabled #95
 - 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 #97: register is deprecated in C++11
+- Fixed issue #96: CUDA issues
+- Added Windows CE detection #92
 
 
 ================================================================================
 ================================================================================
 GLM 0.9.4.4: 2013-05-29
 GLM 0.9.4.4: 2013-05-29