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

Added detection of Visual C++ 2017 toolsets

Browse Source
This commit is contained in:
Groove 2018-07-09 23:23:24 +02:00
parent f889ac0bfe
commit 13ef0f92bc
4 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
glm/detail/setup.hpp
View File

@ -324,20 +324,6 @@
((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CLANG))) ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_CLANG)))
#endif #endif
// N2235
#if GLM_COMPILER & GLM_COMPILER_CLANG
# define GLM_HAS_CONSTEXPR __has_feature(cxx_constexpr)
# define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
#elif GLM_LANG & GLM_LANG_CXX11_FLAG
# define GLM_HAS_CONSTEXPR 1
# define GLM_HAS_CONSTEXPR_PARTIAL GLM_HAS_CONSTEXPR
#else
# define GLM_HAS_CONSTEXPR ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15)) || \
((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)))) // GCC 4.6 support constexpr but there is a compiler bug causing a crash
# define GLM_HAS_CONSTEXPR_PARTIAL (GLM_HAS_CONSTEXPR || ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC14)))
#endif
// N2672 // N2672
#if GLM_COMPILER & GLM_COMPILER_CLANG #if GLM_COMPILER & GLM_COMPILER_CLANG
# define GLM_HAS_INITIALIZER_LISTS __has_feature(cxx_generalized_initializers) # define GLM_HAS_INITIALIZER_LISTS __has_feature(cxx_generalized_initializers)
@ -447,10 +433,12 @@
#elif GLM_LANG & GLM_LANG_CXX11_FLAG #elif GLM_LANG & GLM_LANG_CXX11_FLAG
# define GLM_HAS_CONSTEXPR_CXX11 1 # define GLM_HAS_CONSTEXPR_CXX11 1
#else #else
// GCC 4.6 support constexpr but there is a compiler bug causing a crash
// Visual C++ has a bug #594 https://github.com/g-truc/glm/issues/594
# define GLM_HAS_CONSTEXPR_CXX11 ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ # define GLM_HAS_CONSTEXPR_CXX11 ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC46)) || \ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \ ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL14)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC14) && (GLM_ARCH == GLM_ARCH_PURE)))) // Visual C++ has a bug #594 https://github.com/g-truc/glm/issues/594 ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC14) && (GLM_ARCH == GLM_ARCH_PURE))))
#endif #endif
#if GLM_HAS_CONSTEXPR_CXX11 #if GLM_HAS_CONSTEXPR_CXX11
@ -468,7 +456,7 @@
# define GLM_HAS_CONSTEXPR_CXX14 ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ # define GLM_HAS_CONSTEXPR_CXX14 ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\
((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC50)) || \ ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC50)) || \
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \ ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC14) && (GLM_ARCH == GLM_ARCH_PURE)))) ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15) && (GLM_ARCH == GLM_ARCH_PURE))))
#endif #endif
#if GLM_HAS_CONSTEXPR_CXX14 #if GLM_HAS_CONSTEXPR_CXX14

21
glm/simd/platform.h
View File

@ -84,10 +84,13 @@
// Visual C++ defines // Visual C++ defines
#define GLM_COMPILER_VC 0x01000000 #define GLM_COMPILER_VC 0x01000000
#define GLM_COMPILER_VC12 0x010000B0 #define GLM_COMPILER_VC12 0x01000001
#define GLM_COMPILER_VC14 0x010000C0 #define GLM_COMPILER_VC14 0x01000002
#define GLM_COMPILER_VC15 0x010000D0 #define GLM_COMPILER_VC15 0x01000003
#define GLM_COMPILER_VC16 0x010000E0 #define GLM_COMPILER_VC15_3 0x01000004
#define GLM_COMPILER_VC15_5 0x01000005
#define GLM_COMPILER_VC15_6 0x01000006
#define GLM_COMPILER_VC15_7 0x01000007
// GCC defines // GCC defines
#define GLM_COMPILER_GCC 0x02000000 #define GLM_COMPILER_GCC 0x02000000
@ -200,8 +203,16 @@
# define GLM_COMPILER GLM_COMPILER_VC12 # define GLM_COMPILER GLM_COMPILER_VC12
# elif _MSC_VER == 1900 # elif _MSC_VER == 1900
# define GLM_COMPILER GLM_COMPILER_VC14 # define GLM_COMPILER GLM_COMPILER_VC14
# elif _MSC_VER >= 1910 # elif _MSC_VER == 1910
# define GLM_COMPILER GLM_COMPILER_VC15 # define GLM_COMPILER GLM_COMPILER_VC15
# elif _MSC_VER == 1911
# define GLM_COMPILER GLM_COMPILER_VC15_3
# elif _MSC_VER == 1912
# define GLM_COMPILER GLM_COMPILER_VC15_5
# elif _MSC_VER == 1913
# define GLM_COMPILER GLM_COMPILER_VC15_6
# elif _MSC_VER >= 1914
# define GLM_COMPILER GLM_COMPILER_VC15_7
# endif//_MSC_VER # endif//_MSC_VER
// G++ // G++

1
readme.md
View File

@ -58,6 +58,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
#### Improvements: #### Improvements:
- Added missing vec1 based constructors - Added missing vec1 based constructors
- Redesigned constexpr support which requires disable GLM SIMD on Visual C++ #783 - Redesigned constexpr support which requires disable GLM SIMD on Visual C++ #783
- Added detection of Visual C++ 2017 toolsets
#### Fixes: #### Fixes:
- Fixed build problems due to printf and std::clock_t #778 - Fixed build problems due to printf and std::clock_t #778

13
test/core/core_setup_message.cpp
View File

@ -19,8 +19,17 @@ int test_compiler()
case GLM_COMPILER_VC15: case GLM_COMPILER_VC15:
std::printf("Visual C++ 15 - 2017\n"); std::printf("Visual C++ 15 - 2017\n");
break; break;
case GLM_COMPILER_VC16: case GLM_COMPILER_VC15_3:
std::printf("Visual C++ 16 - 20XX\n"); std::printf("Visual C++ 15.3 - 2017\n");
break;
case GLM_COMPILER_VC15_5:
std::printf("Visual C++ 15.5 - 2017\n");
break;
case GLM_COMPILER_VC15_6:
std::printf("Visual C++ 15.6 - 2017\n");
break;
case GLM_COMPILER_VC15_7:
std::printf("Visual C++ 15.7 - 2017\n");
break; break;
default: default:
std::printf("Visual C++ version not detected\n"); std::printf("Visual C++ version not detected\n");