From baca827371eca97a74a836c03947e83dfe0b9135 Mon Sep 17 00:00:00 2001 From: Groove Date: Tue, 10 Jul 2018 00:28:05 +0200 Subject: [PATCH] Redesigned constexpr support which supports both SIMD and constexpr on Clang #783 --- glm/detail/setup.hpp | 6 +++--- readme.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glm/detail/setup.hpp b/glm/detail/setup.hpp index 9b819b4e5..8df19a8ee 100644 --- a/glm/detail/setup.hpp +++ b/glm/detail/setup.hpp @@ -436,7 +436,7 @@ // 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) && (\ - ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48)) || \ + ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC48) && (GLM_ARCH == GLM_ARCH_PURE)) || \ ((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)))) #endif @@ -454,8 +454,8 @@ # define GLM_HAS_CONSTEXPR_CXX14 1 #else # 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_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17)) || \ + ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER >= GLM_COMPILER_GCC50) && (GLM_ARCH == GLM_ARCH_PURE)) || \ + ((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL17) && (GLM_ARCH == GLM_ARCH_PURE)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC15) && (GLM_ARCH == GLM_ARCH_PURE)))) #endif diff --git a/readme.md b/readme.md index 5901cdb21..4084a8696 100644 --- a/readme.md +++ b/readme.md @@ -57,7 +57,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate) #### Improvements: - Added missing vec1 based constructors -- Redesigned constexpr support which requires disable GLM SIMD on Visual C++ #783 +- Redesigned constexpr support which supports both SIMD and constexpr on Clang #783 - Added detection of Visual C++ 2017 toolsets #### Fixes: