From 2d983ed9cf80bac56ab05e8d651b50d7050e8279 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 15 Jul 2013 10:18:32 +0200 Subject: [PATCH] Added WINCE detection --- glm/core/setup.hpp | 7 ++++++- readme.txt | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index eb11115e..b7d1be06 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -50,6 +50,7 @@ #define GLM_PLATFORM_CHROME_NACL 0x00200000 #define GLM_PLATFORM_UNIX 0x00400000 #define GLM_PLATFORM_QNXNTO 0x00800000 +#define GLM_PLATFORM_WINCE 0x01000000 #ifdef GLM_FORCE_PLATFORM_UNKNOWN # define GLM_PLATFORM GLM_PLATFORM_UNKNOWN @@ -57,6 +58,8 @@ # define GLM_PLATFORM GLM_PLATFORM_QNXNTO #elif defined(__APPLE__) # define GLM_PLATFORM GLM_PLATFORM_APPLE +#elif defined(WINCE) +# define GLM_PLATFORM GLM_PLATFORM_WINCE #elif defined(_WIN32) # define GLM_PLATFORM GLM_PLATFORM_WINDOWS #elif defined(__native_client__) @@ -499,7 +502,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)) diff --git a/readme.txt b/readme.txt index 75fbb57b..e028778e 100644 --- a/readme.txt +++ b/readme.txt @@ -42,6 +42,8 @@ GLM 0.9.4.5: 2013-07-XX - 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 ================================================================================ GLM 0.9.4.4: 2013-05-29