From 229b762c316ad24a267c61e22eb5fc6b40874a86 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Thu, 4 Apr 2019 12:24:02 +0200 Subject: [PATCH] Added Visual C++ 2019 detection --- glm/detail/setup.hpp | 4 ++-- glm/simd/platform.h | 5 ++++- readme.md | 4 ++++ test/core/core_setup_message.cpp | 3 +++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 2983e719..d59808e7 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -7,8 +7,8 @@ #define GLM_VERSION_MINOR 9 #define GLM_VERSION_PATCH 9 #define GLM_VERSION_REVISION 4 -#define GLM_VERSION 995 -#define GLM_VERSION_MESSAGE "GLM: version 0.9.9.5" +#define GLM_VERSION 996 +#define GLM_VERSION_MESSAGE "GLM: version 0.9.9.6" #define GLM_SETUP_INCLUDED GLM_VERSION diff --git a/glm/simd/platform.h b/glm/simd/platform.h index c7b6afd2..34072ef7 100644 --- a/glm/simd/platform.h +++ b/glm/simd/platform.h @@ -60,6 +60,7 @@ #define GLM_COMPILER_VC15_5 0x01000005 #define GLM_COMPILER_VC15_6 0x01000006 #define GLM_COMPILER_VC15_7 0x01000007 +#define GLM_COMPILER_VC16 0x01000008 // GCC defines #define GLM_COMPILER_GCC 0x02000000 @@ -180,8 +181,10 @@ # define GLM_COMPILER GLM_COMPILER_VC15_5 # elif _MSC_VER == 1913 # define GLM_COMPILER GLM_COMPILER_VC15_6 -# elif _MSC_VER >= 1914 +# elif _MSC_VER == 1914 # define GLM_COMPILER GLM_COMPILER_VC15_7 +# elif _MSC_VER >= 1920 +# define GLM_COMPILER GLM_COMPILER_VC16 # endif//_MSC_VER // G++ diff --git a/readme.md b/readme.md index c04295bc..028cc7d3 100644 --- a/readme.md +++ b/readme.md @@ -52,6 +52,10 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) ## Release notes +### [GLM 0.9.9.6](https://github.com/g-truc/glm/tree/master) +#### Improvements: +- Added Visual C++ 2019 detection + ### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01 #### Fixes: - Fixed build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883 diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index f00164dd..979dc848 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -31,6 +31,9 @@ int test_compiler() case GLM_COMPILER_VC15_7: std::printf("Visual C++ 15.7 - 2017\n"); break; + case GLM_COMPILER_VC16: + std::printf("Visual C++ 16 - 2019\n"); + break; default: std::printf("Visual C++ version not detected\n"); Error += 1;