From 8d3bc422e1a7d801e372210e950418d52cf02f4d Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 16 Feb 2017 01:07:16 +0100 Subject: [PATCH] Fixed Clang version detection from source #608 --- glm/detail/setup.hpp | 4 ++-- glm/simd/platform.h | 2 +- readme.md | 4 ++++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 68c8cb47..6017bf5e 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -36,11 +36,11 @@ #define GLM_VERSION_MAJOR 0 #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 8 -#define GLM_VERSION_REVISION 4 +#define GLM_VERSION_REVISION 5 #if GLM_MESSAGES == GLM_MESSAGES_ENABLED && !defined(GLM_MESSAGE_VERSION_DISPLAYED) # define GLM_MESSAGE_VERSION_DISPLAYED -# pragma message ("GLM: version 0.9.8.4") +# pragma message ("GLM: version 0.9.8.5") #endif//GLM_MESSAGES // Report compiler detection diff --git a/glm/simd/platform.h b/glm/simd/platform.h index f7793908..a5510beb 100644 --- a/glm/simd/platform.h +++ b/glm/simd/platform.h @@ -177,7 +177,7 @@ // Clang #elif defined(__clang__) -# if GLM_PLATFORM & GLM_PLATFORM_APPLE +# if defined(__apple_build_version__) # if __clang_major__ == 5 && __clang_minor__ == 0 # define GLM_COMPILER GLM_COMPILER_CLANG33 # elif __clang_major__ == 5 && __clang_minor__ == 1 diff --git a/readme.md b/readme.md index b411c272..77344196 100644 --- a/readme.md +++ b/readme.md @@ -51,6 +51,10 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate) ## Release notes +#### [GLM 0.9.8.5](https://github.com/g-truc/glm/tree/0.9.8) - 2017-0X-XX +##### Fixes: +- Fixed Clang version detection from source #608 + #### [GLM 0.9.8.4](https://github.com/g-truc/glm/releases/tag/0.9.8.4) - 2017-01-22 ##### Fixes: - Fixed GTC_packing test failing on GCC x86 due to denorms #212 #577