Przeglądaj źródła

Improved new version of GCC detection #477

Christophe Riccio 9 lat temu
rodzic
commit
407a7598aa
2 zmienionych plików z 4 dodań i 3 usunięć
  1. 3 3
      glm/detail/setup.hpp
  2. 1 0
      readme.md

+ 3 - 3
glm/detail/setup.hpp

@@ -42,11 +42,11 @@
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MAJOR			0
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_MINOR			9
 #define GLM_VERSION_PATCH			7
 #define GLM_VERSION_PATCH			7
-#define GLM_VERSION_REVISION		2
+#define GLM_VERSION_REVISION		3
 
 
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED))
 #if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_VERSION_DISPLAYED))
 #	define GLM_MESSAGE_VERSION_DISPLAYED
 #	define GLM_MESSAGE_VERSION_DISPLAYED
-#	pragma message ("GLM: version 0.9.7.2")
+#	pragma message ("GLM: version 0.9.7.3")
 #endif//GLM_MESSAGE
 #endif//GLM_MESSAGE
 
 
 ///////////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////////
@@ -313,7 +313,7 @@
 #		define GLM_COMPILER (GLM_COMPILER_GCC52)
 #		define GLM_COMPILER (GLM_COMPILER_GCC52)
 #	elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)
 #	elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)
 #		define GLM_COMPILER (GLM_COMPILER_GCC53)
 #		define GLM_COMPILER (GLM_COMPILER_GCC53)
-#	elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0)
+#	elif (__GNUC__ >= 6)
 #		define GLM_COMPILER (GLM_COMPILER_GCC60)
 #		define GLM_COMPILER (GLM_COMPILER_GCC60)
 #	else
 #	else
 #		define GLM_COMPILER (GLM_COMPILER_GCC)
 #		define GLM_COMPILER (GLM_COMPILER_GCC)

+ 1 - 0
readme.md

@@ -54,6 +54,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
 #### [GLM 0.9.7.3](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX
 #### [GLM 0.9.7.3](https://github.com/g-truc/glm/tree/0.9.7) - 2016-XX-XX
 ##### Fixes:
 ##### Fixes:
 - Fixed CMake policy warning
 - Fixed CMake policy warning
+- Fixed GCC 6.0 detection
 
 
 #### [GLM 0.9.7.2](https://github.com/g-truc/glm/releases/tag/0.9.7.2) - 2016-01-03
 #### [GLM 0.9.7.2](https://github.com/g-truc/glm/releases/tag/0.9.7.2) - 2016-01-03
 ##### Fixes:
 ##### Fixes: