organicmaps/glm
13
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2025-04-06 14:05:01 +00:00
Code Issues 1 Projects Releases Wiki Activity Actions

Updated compiler detection

Browse source
This commit is contained in:
Christophe Riccio 2013-08-27 10:50:33 +02:00
parent 80f6c06c78
commit 1de93021bd
3 changed files with 7 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
glm/core/setup.hpp
View file

@ -156,6 +156,7 @@
#define GLM_COMPILER_GCC46 0x020000D0
#define GLM_COMPILER_GCC47 0x020000E0
#define GLM_COMPILER_GCC48 0x020000F0
#define GLM_COMPILER_GCC49 0x02000100
// G++ command line to display defined
// echo "" | g++ -E -dM -x c++ - | sort

1
glm/glm.hpp
View file

@ -134,7 +134,6 @@
////////////////////
// check type sizes
#ifndef GLM_STATIC_ASSERT_NULL
GLM_STATIC_ASSERT(sizeof(glm::float16) == 2, "float16 size isn't 2 bytes on this platform");
GLM_STATIC_ASSERT(sizeof(glm::float32) == 4, "float32 size isn't 4 bytes on this platform");
GLM_STATIC_ASSERT(sizeof(glm::float64) == 8, "float64 size isn't 8 bytes on this platform");
#endif//GLM_STATIC_ASSERT_NULL

26
test/core/core_setup_message.cpp
View file

@ -51,6 +51,9 @@ int test_compiler()
case GLM_COMPILER_VC2012:
std::cout << "GLM_COMPILER_VC2012" << std::endl;
break;
case GLM_COMPILER_VC2013:
std::cout << "GLM_COMPILER_VC2013" << std::endl;
break;
default:
std::cout << "Visual C++ version not detected" << std::endl;
Error += 1;
@ -108,6 +111,9 @@ int test_compiler()
case GLM_COMPILER_GCC48:
std::cout << "GLM_COMPILER_GCC48" << std::endl;
break;
case GLM_COMPILER_GCC49:
std::cout << "GLM_COMPILER_GCC49" << std::endl;
break;
default:
std::cout << "GCC version not detected" << std::endl;
Error += 1;
@ -117,26 +123,6 @@ int test_compiler()
else if(GLM_COMPILER & GLM_COMPILER_BC)
{
std::cout << "GLM_COMPILER_BC" << std::endl;
switch(GLM_COMPILER)
{
case GLM_COMPILER_BCB4:
std::cout << "GLM_COMPILER_BCB4" << std::endl;
break;
case GLM_COMPILER_BCB5:
std::cout << "GLM_COMPILER_BCB5" << std::endl;
break;
case GLM_COMPILER_BCB6:
std::cout << "GLM_COMPILER_BCB6" << std::endl;
break;
case GLM_COMPILER_BCB2009:
std::cout << "GLM_COMPILER_BCB2009" << std::endl;
break;
default:
std::cout << "Borland C++ version not detected" << std::endl;
Error += 1;
break;
}
}
else if(GLM_COMPILER & GLM_COMPILER_CODEWARRIOR)
{