From b592d9ff8353e5fef30ff9c29410ba9015c2d5b0 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 12 Aug 2013 23:05:29 +0200 Subject: [PATCH 1/3] Added WINCE detection #92 --- glm/core/setup.hpp | 3 +++ readme.txt | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index eb11115e..854e2ebb 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__) diff --git a/readme.txt b/readme.txt index 14709287..62d31cb6 100644 --- a/readme.txt +++ b/readme.txt @@ -37,11 +37,12 @@ More informations in GLM manual: http://glm.g-truc.net/glm.pdf ================================================================================ -GLM 0.9.4.5: 2013-06-XX +GLM 0.9.4.5: 2013-08-13 -------------------------------------------------------------------------------- - Fixed inclusion of intrinsics in "pure" mode #92 - Fixed language detection on GCC when the C++0x mode isn't enabled #95 - Added missing value_ptr for quaternions #99 +- Added WINCE detection #92 ================================================================================ GLM 0.9.4.4: 2013-05-29 From 37ae8da67c8f6810fc40d85a11dc452b3ef2218f Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 12 Aug 2013 23:18:28 +0200 Subject: [PATCH 2/3] Updated readme for release --- readme.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/readme.txt b/readme.txt index 62d31cb6..6fcb28aa 100644 --- a/readme.txt +++ b/readme.txt @@ -37,9 +37,10 @@ More informations in GLM manual: http://glm.g-truc.net/glm.pdf ================================================================================ -GLM 0.9.4.5: 2013-08-13 +GLM 0.9.4.5: 2013-08-12 -------------------------------------------------------------------------------- -- Fixed inclusion of intrinsics in "pure" mode #92 +- 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 - Added missing value_ptr for quaternions #99 - Added WINCE detection #92 From 54a395abd9a55b10173f2797d496a292f7613051 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Tue, 13 Aug 2013 23:22:16 +0200 Subject: [PATCH 3/3] Added Visual C++ 2013 detection --- glm/core/setup.hpp | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 854e2ebb..798720a5 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -36,7 +36,7 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 4 -#define GLM_VERSION_REVISION 5 +#define GLM_VERSION_REVISION 6 /////////////////////////////////////////////////////////////////////////////////////////////////// // Platform @@ -77,20 +77,24 @@ // Report platform detection #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_PLATFORM_DISPLAYED)) # define GLM_MESSAGE_PLATFORM_DISPLAYED -# if(GLM_PLATFORM & GLM_PLATFORM_WINDOWS) -# pragma message("GLM: Windows platform detected") +# if(GLM_PLATFORM & GLM_PLATFORM_QNXNTO) +# pragma message("GLM: QNX platform detected") //# elif(GLM_PLATFORM & GLM_PLATFORM_IOS) //# pragma message("GLM: iOS platform detected") # elif(GLM_PLATFORM & GLM_PLATFORM_APPLE) # pragma message("GLM: Apple platform detected") +# elif(GLM_PLATFORM & GLM_PLATFORM_WINCE) +# pragma message("GLM: WinCE platform detected") +# elif(GLM_PLATFORM & GLM_PLATFORM_WINDOWS) +# pragma message("GLM: Windows platform detected") +# elif(GLM_PLATFORM & GLM_PLATFORM_CHROME_NACL) +# pragma message("GLM: Native Client detected") +# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) +# pragma message("GLM: Android platform detected") # elif(GLM_PLATFORM & GLM_PLATFORM_LINUX) # pragma message("GLM: Linux platform detected") # elif(GLM_PLATFORM & GLM_PLATFORM_UNIX) # pragma message("GLM: UNIX platform detected") -# elif(GLM_PLATFORM & GLM_PLATFORM_ANDROID) -# pragma message("GLM: Android platform detected") -# elif(GLM_PLATFORM & GLM_PLATFORM_CHROME_NACL) -# pragma message("GLM: Chrone Native Client detected") # elif(GLM_PLATFORM & GLM_PLATFORM_UNKNOWN) # pragma message("GLM: platform unknown") # else @@ -118,6 +122,7 @@ #define GLM_COMPILER_VC2008 0x01000080 #define GLM_COMPILER_VC2010 0x01000090 #define GLM_COMPILER_VC2012 0x010000A0 +#define GLM_COMPILER_VC2013 0x010000B0 // GCC defines #define GLM_COMPILER_GCC 0x02000000 @@ -267,6 +272,8 @@ # define GLM_COMPILER GLM_COMPILER_VC2010 # elif _MSC_VER == 1700 # define GLM_COMPILER GLM_COMPILER_VC2012 +# elif _MSC_VER == 1800 +# define GLM_COMPILER GLM_COMPILER_VC2013 # else//_MSC_VER # define GLM_COMPILER GLM_COMPILER_VC # endif//_MSC_VER