mewin/glm
1
0
Fork 0
Code Releases Activity

Added compiler detection

Browse Source
This commit is contained in:
Christophe Riccio
2012-09-20 11:40:15 +02:00
parent 1eac545656
commit c6d87a9458
2 changed files with 96 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
glm/core/setup.hpp
View File

@@ -114,7 +114,7 @@
#define GLM_COMPILER_VC2005 0x01000070 #define GLM_COMPILER_VC2005 0x01000070
#define GLM_COMPILER_VC2008 0x01000080 #define GLM_COMPILER_VC2008 0x01000080
#define GLM_COMPILER_VC2010 0x01000090 #define GLM_COMPILER_VC2010 0x01000090
#define GLM_COMPILER_VC2011 0x010000A0 #define GLM_COMPILER_VC2012 0x010000A0
// GCC defines // GCC defines
#define GLM_COMPILER_GCC 0x02000000 #define GLM_COMPILER_GCC 0x02000000
@@ -259,7 +259,7 @@
# elif _MSC_VER == 1600 # elif _MSC_VER == 1600
# define GLM_COMPILER GLM_COMPILER_VC2010 # define GLM_COMPILER GLM_COMPILER_VC2010
# elif _MSC_VER == 1700 # elif _MSC_VER == 1700
# define GLM_COMPILER GLM_COMPILER_VC2011 # define GLM_COMPILER GLM_COMPILER_VC2012
# else//_MSC_VER # else//_MSC_VER
# define GLM_COMPILER GLM_COMPILER_VC # define GLM_COMPILER GLM_COMPILER_VC
# endif//_MSC_VER # endif//_MSC_VER

109
test/core/core_setup_message.cpp
View File

@@ -15,11 +15,12 @@ int test_compiler()
{ {
int Error(0); int Error(0);
if(GLM_COMPILER & GLM_COMPILER_VC)
{
std::cout << "GLM_COMPILER_VC" << std::endl;
switch(GLM_COMPILER) switch(GLM_COMPILER)
{ {
case GLM_COMPILER_VC:
std::cout << "GLM_COMPILER_VC" << std::endl;
break;
case GLM_COMPILER_VC2: case GLM_COMPILER_VC2:
std::cout << "GLM_COMPILER_VC2" << std::endl; std::cout << "GLM_COMPILER_VC2" << std::endl;
break; break;
@@ -47,13 +48,21 @@ int test_compiler()
case GLM_COMPILER_VC2010: case GLM_COMPILER_VC2010:
std::cout << "GLM_COMPILER_VC2010" << std::endl; std::cout << "GLM_COMPILER_VC2010" << std::endl;
break; break;
case GLM_COMPILER_VC2011: case GLM_COMPILER_VC2012:
std::cout << "GLM_COMPILER_VC2011" << std::endl; std::cout << "GLM_COMPILER_VC2012" << std::endl;
break; break;
default:
case GLM_COMPILER_GCC: std::cout << "Visual C++ version not detected" << std::endl;
Error += 1;
break;
}
}
else if(GLM_COMPILER & GLM_COMPILER_GCC)
{
std::cout << "GLM_COMPILER_GCC" << std::endl; std::cout << "GLM_COMPILER_GCC" << std::endl;
break;
switch(GLM_COMPILER)
{
case GLM_COMPILER_GCC30: case GLM_COMPILER_GCC30:
std::cout << "GLM_COMPILER_GCC30" << std::endl; std::cout << "GLM_COMPILER_GCC30" << std::endl;
break; break;
@@ -96,10 +105,21 @@ int test_compiler()
case GLM_COMPILER_GCC47: case GLM_COMPILER_GCC47:
std::cout << "GLM_COMPILER_GCC47" << std::endl; std::cout << "GLM_COMPILER_GCC47" << std::endl;
break; break;
case GLM_COMPILER_GCC48:
case GLM_COMPILER_BC: std::cout << "GLM_COMPILER_GCC48" << std::endl;
std::cout << "GLM_COMPILER_BC" << std::endl;
break; break;
default:
std::cout << "GCC version not detected" << std::endl;
Error += 1;
break;
}
}
else if(GLM_COMPILER & GLM_COMPILER_BC)
{
std::cout << "GLM_COMPILER_BC" << std::endl;
switch(GLM_COMPILER)
{
case GLM_COMPILER_BCB4: case GLM_COMPILER_BCB4:
std::cout << "GLM_COMPILER_BCB4" << std::endl; std::cout << "GLM_COMPILER_BCB4" << std::endl;
break; break;
@@ -112,15 +132,26 @@ int test_compiler()
case GLM_COMPILER_BCB2009: case GLM_COMPILER_BCB2009:
std::cout << "GLM_COMPILER_BCB2009" << std::endl; std::cout << "GLM_COMPILER_BCB2009" << std::endl;
break; break;
case GLM_COMPILER_CODEWARRIOR: default:
std::cout << "Borland C++ version not detected" << std::endl;
Error += 1;
break;
}
}
else if(GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
{
std::cout << "GLM_COMPILER_CODEWARRIOR" << std::endl; std::cout << "GLM_COMPILER_CODEWARRIOR" << std::endl;
break; }
case GLM_COMPILER_CUDA: else if(GLM_COMPILER & GLM_COMPILER_CUDA)
{
std::cout << "GLM_COMPILER_CUDA" << std::endl; std::cout << "GLM_COMPILER_CUDA" << std::endl;
break; }
case GLM_COMPILER_CLANG: else if(GLM_COMPILER & GLM_COMPILER_CLANG)
{
std::cout << "GLM_COMPILER_CLANG" << std::endl; std::cout << "GLM_COMPILER_CLANG" << std::endl;
break;
switch(GLM_COMPILER)
{
case GLM_COMPILER_CLANG26: case GLM_COMPILER_CLANG26:
std::cout << "GLM_COMPILER_CLANG26" << std::endl; std::cout << "GLM_COMPILER_CLANG26" << std::endl;
break; break;
@@ -139,13 +170,51 @@ 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_LLVM_GCC: default:
std::cout << "GLM_COMPILER_LLVM_GCC" << std::endl; std::cout << "Clang version not detected" << std::endl;
Error += 1;
break; break;
case GLM_COMPILER_INTEL: }
}
else if(GLM_COMPILER & GLM_COMPILER_LLVM_GCC)
{
std::cout << "GLM_COMPILER_LLVM_GCC" << std::endl;
}
else if(GLM_COMPILER & GLM_COMPILER_INTEL)
{
std::cout << "GLM_COMPILER_INTEL" << std::endl; std::cout << "GLM_COMPILER_INTEL" << std::endl;
switch(GLM_COMPILER)
{
case GLM_COMPILER_INTEL9:
std::cout << "GLM_COMPILER_INTEL9" << std::endl;
break;
case GLM_COMPILER_INTEL10_0:
std::cout << "GLM_COMPILER_INTEL10_0" << std::endl;
break;
case GLM_COMPILER_INTEL10_1:
std::cout << "GLM_COMPILER_INTEL10_1" << std::endl;
break;
case GLM_COMPILER_INTEL11_0:
std::cout << "GLM_COMPILER_INTEL11_0" << std::endl;
break;
case GLM_COMPILER_INTEL11_1:
std::cout << "GLM_COMPILER_INTEL11_1" << std::endl;
break;
case GLM_COMPILER_INTEL12_1:
std::cout << "GLM_COMPILER_INTEL12_1" << std::endl;
break;
case GLM_COMPILER_INTEL13_0:
std::cout << "GLM_COMPILER_INTEL13_0" << std::endl;
break; break;
default: default:
std::cout << "Intel compiler version not detected" << std::endl;
Error += 1;
break;
}
}
else
{
std::cout << "Undetected compiler" << std::endl; std::cout << "Undetected compiler" << std::endl;
Error += 1; Error += 1;
} }