Browse Source

Added Visual C++ 2019 detection

Christophe Riccio 6 years ago
parent
commit
229b762c31
4 changed files with 13 additions and 3 deletions
  1. 2 2
      glm/detail/setup.hpp
  2. 4 1
      glm/simd/platform.h
  3. 4 0
      readme.md
  4. 3 0
      test/core/core_setup_message.cpp

+ 2 - 2
glm/detail/setup.hpp

@@ -7,8 +7,8 @@
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			9
 #define GLM_VERSION_PATCH			9
 #define GLM_VERSION_REVISION		4
 #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
 #define GLM_SETUP_INCLUDED			GLM_VERSION
 
 

+ 4 - 1
glm/simd/platform.h

@@ -60,6 +60,7 @@
 #define GLM_COMPILER_VC15_5			0x01000005
 #define GLM_COMPILER_VC15_5			0x01000005
 #define GLM_COMPILER_VC15_6			0x01000006
 #define GLM_COMPILER_VC15_6			0x01000006
 #define GLM_COMPILER_VC15_7			0x01000007
 #define GLM_COMPILER_VC15_7			0x01000007
+#define GLM_COMPILER_VC16			0x01000008
 
 
 // GCC defines
 // GCC defines
 #define GLM_COMPILER_GCC			0x02000000
 #define GLM_COMPILER_GCC			0x02000000
@@ -180,8 +181,10 @@
 #		define GLM_COMPILER GLM_COMPILER_VC15_5
 #		define GLM_COMPILER GLM_COMPILER_VC15_5
 #	elif _MSC_VER == 1913
 #	elif _MSC_VER == 1913
 #		define GLM_COMPILER GLM_COMPILER_VC15_6
 #		define GLM_COMPILER GLM_COMPILER_VC15_6
-#	elif _MSC_VER >= 1914
+#	elif _MSC_VER == 1914
 #		define GLM_COMPILER GLM_COMPILER_VC15_7
 #		define GLM_COMPILER GLM_COMPILER_VC15_7
+#	elif _MSC_VER >= 1920
+#		define GLM_COMPILER GLM_COMPILER_VC16
 #	endif//_MSC_VER
 #	endif//_MSC_VER
 
 
 // G++
 // G++

+ 4 - 0
readme.md

@@ -52,6 +52,10 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
 
 
 ## Release notes
 ## 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
 ### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01
 #### Fixes:
 #### Fixes:
 - Fixed build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883
 - Fixed build errors when defining GLM_ENABLE_EXPERIMENTAL #884 #883

+ 3 - 0
test/core/core_setup_message.cpp

@@ -31,6 +31,9 @@ int test_compiler()
 		case GLM_COMPILER_VC15_7:
 		case GLM_COMPILER_VC15_7:
 			std::printf("Visual C++ 15.7 - 2017\n");
 			std::printf("Visual C++ 15.7 - 2017\n");
 			break;
 			break;
+		case GLM_COMPILER_VC16:
+			std::printf("Visual C++ 16 - 2019\n");
+			break;
 		default:
 		default:
 			std::printf("Visual C++ version not detected\n");
 			std::printf("Visual C++ version not detected\n");
 			Error += 1;
 			Error += 1;