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

Merge branch '0.9.4' of https://github.com/g-truc/glm into 0.9.4

Browse Source
This commit is contained in:
Christophe Riccio 2012-10-09 20:36:31 +02:00
commit 88092b1c19
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/core/setup.hpp
View File

@ -171,6 +171,8 @@
#define GLM_COMPILER_CLANG31 0x20000060 #define GLM_COMPILER_CLANG31 0x20000060
#define GLM_COMPILER_CLANG32 0x20000070 #define GLM_COMPILER_CLANG32 0x20000070
#define GLM_COMPILER_CLANG33 0x20000080 #define GLM_COMPILER_CLANG33 0x20000080
#define GLM_COMPILER_CLANG40 0x20000090
#define GLM_COMPILER_CLANG41 0x200000A0
// LLVM GCC // LLVM GCC
#define GLM_COMPILER_LLVM_GCC 0x40000000 #define GLM_COMPILER_LLVM_GCC 0x40000000
@ -282,6 +284,10 @@
# define GLM_COMPILER GLM_COMPILER_CLANG32 # define GLM_COMPILER GLM_COMPILER_CLANG32
# elif(__clang_major__ == 3) && (__clang_minor__ == 3) # elif(__clang_major__ == 3) && (__clang_minor__ == 3)
# define GLM_COMPILER GLM_COMPILER_CLANG33 # define GLM_COMPILER GLM_COMPILER_CLANG33
# elif(__clang_major__ == 4) && (__clang_minor__ == 0)
# define GLM_COMPILER GLM_COMPILER_CLANG40
# elif(__clang_major__ == 4) && (__clang_minor__ == 1)
# define GLM_COMPILER GLM_COMPILER_CLANG41
# else # else
# define GLM_COMPILER GLM_COMPILER_CLANG # define GLM_COMPILER GLM_COMPILER_CLANG
# endif # endif

12
test/core/core_setup_message.cpp
View File

@ -148,7 +148,7 @@ int test_compiler()
} }
else if(GLM_COMPILER & GLM_COMPILER_CLANG) else if(GLM_COMPILER & GLM_COMPILER_CLANG)
{ {
std::cout << "GLM_COMPILER_CLANG" << std::endl; std::cout << "GLM_COMPILER_CLANG " << __clang_major__ << "." << __clang_minor__ << std::endl;
switch(GLM_COMPILER) switch(GLM_COMPILER)
{ {
@ -170,9 +170,17 @@ int test_compiler()
case GLM_COMPILER_CLANG31: case GLM_COMPILER_CLANG31:
std::cout << "GLM_COMPILER_CLANG31" << std::endl; std::cout << "GLM_COMPILER_CLANG31" << std::endl;
break; break;
case GLM_COMPILER_CLANG32:
std::cout << "GLM_COMPILER_CLANG32" << std::endl;
break;
case GLM_COMPILER_CLANG33:
std::cout << "GLM_COMPILER_CLANG33" << std::endl;
break;
case GLM_COMPILER_CLANG40:
std::cout << "GLM_COMPILER_CLANG40" << std::endl;
break;
default: default:
std::cout << "Clang version not detected" << std::endl; std::cout << "Clang version not detected" << std::endl;
Error += 1;
break; break;
} }
} }