From 4e43b388bdc2593f33e99d08fc00cd0a577e1720 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 14 Jul 2013 20:24:40 +0200 Subject: [PATCH 1/6] Updated release note for bug #97 --- readme.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index 7c066843..75fbb57b 100644 --- a/readme.txt +++ b/readme.txt @@ -37,10 +37,11 @@ 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-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 ================================================================================ GLM 0.9.4.4: 2013-05-29 From 2d983ed9cf80bac56ab05e8d651b50d7050e8279 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 15 Jul 2013 10:18:32 +0200 Subject: [PATCH 2/6] 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 From b27ab93b194a82422dade253bcf1492299dd93e1 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Mon, 15 Jul 2013 10:33:00 +0200 Subject: [PATCH 3/6] Updated release date fo GLM 0.9.4.5 --- readme.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.txt b/readme.txt index e028778e..7dfa1cf2 100644 --- a/readme.txt +++ b/readme.txt @@ -37,7 +37,7 @@ More informations in GLM manual: http://glm.g-truc.net/glm.pdf ================================================================================ -GLM 0.9.4.5: 2013-07-XX +GLM 0.9.4.5: 2013-07-15 -------------------------------------------------------------------------------- - Fixed inclusion of intrinsics in "pure" mode #92 - Fixed language detection on GCC when the C++0x mode isn't enabled #95 From d0e382592a1fcc0b920f3630e4b7ccea0ccf3e1b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 19:53:03 +0200 Subject: [PATCH 4/6] Fixed C++0X on VisualC++ 2012+ --- glm/core/setup.hpp | 4 ++-- readme.txt | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 798720a5..f4e013c0 100644 --- a/glm/core/setup.hpp +++ b/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 diff --git a/readme.txt b/readme.txt index 6fcb28aa..165708c2 100644 --- a/readme.txt +++ b/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 -------------------------------------------------------------------------------- From caf8f991cac75ab9b84a49478f228b73683e305b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 21:07:47 +0200 Subject: [PATCH 5/6] Fixed detection to select the last known compiler if newer version #106 --- glm/core/setup.hpp | 29 ++++++++--------------------- readme.txt | 5 +++-- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index f4e013c0..24326e5b 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -221,7 +221,7 @@ # define GLM_COMPILER GLM_COMPILER_INTEL12_0 # elif __INTEL_COMPILER == 1210 # define GLM_COMPILER GLM_COMPILER_INTEL12_1 -# elif __INTEL_COMPILER == 1300 +# elif __INTEL_COMPILER >= 1300 # define GLM_COMPILER GLM_COMPILER_INTEL13_0 # else # define GLM_COMPILER GLM_COMPILER_INTEL @@ -229,26 +229,11 @@ // CUDA #elif defined(__CUDACC__) -# define GLM_COMPILER GLM_COMPILER_CUDA -/* # if CUDA_VERSION < 3000 # error "GLM requires CUDA 3.0 or higher" -# elif CUDA_VERSION == 3000 -# define GLM_COMPILER GLM_COMPILER_CUDA30 -# elif CUDA_VERSION == 3010 -# define GLM_COMPILER GLM_COMPILER_CUDA31 -# elif CUDA_VERSION == 3020 -# define GLM_COMPILER GLM_COMPILER_CUDA32 -# elif CUDA_VERSION == 4000 -# define GLM_COMPILER GLM_COMPILER_CUDA40 -# elif CUDA_VERSION == 4010 -# define GLM_COMPILER GLM_COMPILER_CUDA41 -# elif CUDA_VERSION == 4020 -# define GLM_COMPILER GLM_COMPILER_CUDA42 # else # define GLM_COMPILER GLM_COMPILER_CUDA # endif -*/ // Visual C++ #elif defined(_MSC_VER) @@ -272,7 +257,7 @@ # define GLM_COMPILER GLM_COMPILER_VC2010 # elif _MSC_VER == 1700 # define GLM_COMPILER GLM_COMPILER_VC2012 -# elif _MSC_VER == 1800 +# elif _MSC_VER >= 1800 # define GLM_COMPILER GLM_COMPILER_VC2013 # else//_MSC_VER # define GLM_COMPILER GLM_COMPILER_VC @@ -302,7 +287,9 @@ # define GLM_COMPILER GLM_COMPILER_CLANG41 # elif(__clang_major__ == 4) && (__clang_minor__ == 2) # define GLM_COMPILER GLM_COMPILER_CLANG42 -# elif(__clang_major__ == 4) && (__clang_minor__ == 3) +# elif(__clang_major__ == 4) && (__clang_minor__ >= 3) +# define GLM_COMPILER GLM_COMPILER_CLANG43 +# elif(__clang_major__ > 4) # define GLM_COMPILER GLM_COMPILER_CLANG43 # else # define GLM_COMPILER GLM_COMPILER_CLANG @@ -336,10 +323,10 @@ # define GLM_COMPILER (GLM_COMPILER_GCC47) # elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 8) # define GLM_COMPILER (GLM_COMPILER_GCC48) -# elif (__GNUC__ == 4) && (__GNUC_MINOR__ == 9) +# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9) +# define GLM_COMPILER (GLM_COMPILER_GCC49) +# elif (__GNUC__ > 4 ) # define GLM_COMPILER (GLM_COMPILER_GCC49) -# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 0) -# define GLM_COMPILER (GLM_COMPILER_GCC50) # else # define GLM_COMPILER (GLM_COMPILER_GCC) # endif diff --git a/readme.txt b/readme.txt index 165708c2..6eececd3 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.6: 2013-XX-XX +GLM 0.9.4.6: 2013-08-XX -------------------------------------------------------------------------------- - +- Fixed detection to select the last known compiler if newer version #106 +- ================================================================================ GLM 0.9.4.5: 2013-08-12 From 1ab7271e7d0a6c8d2165ff179fe38465646dfad3 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 21:33:13 +0200 Subject: [PATCH 6/6] Fixed is_int and is_uint code duplication with GCC and C++11 #107 --- glm/core/type_int.hpp | 8 +++++++- readme.txt | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/glm/core/type_int.hpp b/glm/core/type_int.hpp index 147559d1..c7de0c5a 100644 --- a/glm/core/type_int.hpp +++ b/glm/core/type_int.hpp @@ -47,13 +47,19 @@ namespace detail GLM_DETAIL_IS_INT(signed short); GLM_DETAIL_IS_INT(signed int); GLM_DETAIL_IS_INT(signed long); - GLM_DETAIL_IS_INT(highp_int_t); GLM_DETAIL_IS_UINT(unsigned char); GLM_DETAIL_IS_UINT(unsigned short); GLM_DETAIL_IS_UINT(unsigned int); GLM_DETAIL_IS_UINT(unsigned long); + +#if(GLM_LANG >= GLM_LANG_CXX0X) + GLM_DETAIL_IS_INT(signed long long); + GLM_DETAIL_IS_UINT(unsigned long long); +#else + GLM_DETAIL_IS_INT(highp_int_t); GLM_DETAIL_IS_UINT(highp_uint_t); +#endif }//namespace detail /// @addtogroup core_precision diff --git a/readme.txt b/readme.txt index f605b998..39888689 100644 --- a/readme.txt +++ b/readme.txt @@ -40,7 +40,7 @@ http://glm.g-truc.net/glm.pdf GLM 0.9.4.6: 2013-08-XX -------------------------------------------------------------------------------- - Fixed detection to select the last known compiler if newer version #106 -- +- Fixed is_int and is_uint code duplication with GCC and C++11 #107 ================================================================================ GLM 0.9.4.5: 2013-08-12