diff --git a/glm/core/setup.hpp b/glm/core/setup.hpp index 3502a7d0..b6214806 100644 --- a/glm/core/setup.hpp +++ b/glm/core/setup.hpp @@ -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 diff --git a/glm/glm.hpp b/glm/glm.hpp index e4ad5eca..0056e3a6 100644 --- a/glm/glm.hpp +++ b/glm/glm.hpp @@ -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 diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index a9d10a71..71b0a61f 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -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) {