mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 12:41:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #477 from muep/master

Browse Source 
Setup: detect GCC 6.0 #477
This commit is contained in:
Angelica Wrangler 2016-02-15 20:24:54 +01:00
commit 4afc6b723a
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glm/detail/setup.hpp
View File

@ -151,6 +151,7 @@
#define GLM_COMPILER_GCC51 0x02000300 #define GLM_COMPILER_GCC51 0x02000300
#define GLM_COMPILER_GCC52 0x02000400 #define GLM_COMPILER_GCC52 0x02000400
#define GLM_COMPILER_GCC53 0x02000500 #define GLM_COMPILER_GCC53 0x02000500
#define GLM_COMPILER_GCC60 0x02000600
// CUDA // CUDA
#define GLM_COMPILER_CUDA 0x10000000 #define GLM_COMPILER_CUDA 0x10000000
@ -312,6 +313,8 @@
# 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)
# define GLM_COMPILER (GLM_COMPILER_GCC60)
# else # else
# define GLM_COMPILER (GLM_COMPILER_GCC) # define GLM_COMPILER (GLM_COMPILER_GCC)
# endif # endif

3
test/core/core_setup_message.cpp
View File

@ -71,6 +71,9 @@ int test_compiler()
case GLM_COMPILER_GCC53: case GLM_COMPILER_GCC53:
std::printf("GLM_COMPILER_GCC53\n"); std::printf("GLM_COMPILER_GCC53\n");
break; break;
case GLM_COMPILER_GCC60:
std::printf("GLM_COMPILER_GCC60\n");
break;
default: default:
std::printf("GCC version not detected\n"); std::printf("GCC version not detected\n");
Error += 1; Error += 1;