From 19e239d466dd858af6e942c54b0547f64952bc67 Mon Sep 17 00:00:00 2001 From: Christophe Riccio Date: Sun, 12 Oct 2014 20:57:41 +0200 Subject: [PATCH] Fixed core_setup_message test with Visual C++ --- glm/detail/setup.hpp | 1 + test/core/core_setup_message.cpp | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 4bf77b1d..1be82bdc 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -178,6 +178,7 @@ #define GLM_COMPILER_CLANG42 0x200000B0 #define GLM_COMPILER_CLANG43 0x200000C0 #define GLM_COMPILER_CLANG50 0x200000D0 +#define GLM_COMPILER_CLANG60 0x200000E0 // LLVM GCC #define GLM_COMPILER_LLVM_GCC 0x40000000 diff --git a/test/core/core_setup_message.cpp b/test/core/core_setup_message.cpp index 84f3ee5e..ca029f06 100644 --- a/test/core/core_setup_message.cpp +++ b/test/core/core_setup_message.cpp @@ -34,6 +34,9 @@ int test_compiler() case GLM_COMPILER_VC12: std::cout << "GLM_COMPILER_VC12" << std::endl; break; + case GLM_COMPILER_VC13: + std::cout << "GLM_COMPILER_VC13" << std::endl; + break; default: std::cout << "Visual C++ version not detected" << std::endl; Error += 1; @@ -80,6 +83,9 @@ int test_compiler() case GLM_COMPILER_GCC49: std::cout << "GLM_COMPILER_GCC49" << std::endl; break; + case GLM_COMPILER_GCC50: + std::cout << "GLM_COMPILER_GCC50" << std::endl; + break; default: std::cout << "GCC version not detected" << std::endl; Error += 1; @@ -133,6 +139,9 @@ int test_compiler() case GLM_COMPILER_CLANG50: std::cout << "GLM_COMPILER_CLANG50" << std::endl; break; + case GLM_COMPILER_CLANG60: + std::cout << "GLM_COMPILER_CLANG60" << std::endl; + break; default: std::cout << "Clang version not detected" << std::endl; break;