From caf8f991cac75ab9b84a49478f228b73683e305b Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 18 Aug 2013 21:07:47 +0200 Subject: [PATCH] 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