Merge branch '0.9.8'

master
Christophe Riccio ago%!(EXTRA string=9 years)
commit 9d4f0ba758
  1. 20
      glm/detail/setup.hpp
  2. 2
      readme.md

@ -136,16 +136,24 @@
#define GLM_LANG_CXXGNU GLM_LANG_CXXGNU_FLAG #define GLM_LANG_CXXGNU GLM_LANG_CXXGNU_FLAG
#if defined(GLM_FORCE_CXX14) #if defined(GLM_FORCE_CXX14)
# undef GLM_FORCE_CXX11 # if((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER <= GLM_COMPILER_GCC50)) || ((GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER <= GLM_COMPILER_CLANG34))
# undef GLM_FORCE_CXX03 # pragma message("GLM: Using GLM_FORCE_CXX14 with a compiler that doesn't fully support C++14")
# undef GLM_FORCE_CXX98 # elif GLM_COMPILER & GLM_COMPILER_VC
# pragma message("GLM: Using GLM_FORCE_CXX14 but there is no known version of Visual C++ compiler that fully supports C++14")
# elif GLM_COMPILER & GLM_COMPILER_INTEL
# pragma message("GLM: Using GLM_FORCE_CXX14 but there is no known version of ICC compiler that fully supports C++14")
# endif
# define GLM_LANG GLM_LANG_CXX14 # define GLM_LANG GLM_LANG_CXX14
#elif defined(GLM_FORCE_CXX11) #elif defined(GLM_FORCE_CXX11)
# undef GLM_FORCE_CXX03 # if((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER <= GLM_COMPILER_GCC48)) || ((GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER <= GLM_COMPILER_CLANG33))
# undef GLM_FORCE_CXX98 # pragma message("GLM: Using GLM_FORCE_CXX11 with a compiler that doesn't fully support C++11")
# elif GLM_COMPILER & GLM_COMPILER_VC
# pragma message("GLM: Using GLM_FORCE_CXX11 but there is no known version of Visual C++ compiler that fully supports C++11")
# elif GLM_COMPILER & GLM_COMPILER_INTEL
# pragma message("GLM: Using GLM_FORCE_CXX11 but there is no known version of ICC compiler that fully supports C++11")
# endif
# define GLM_LANG GLM_LANG_CXX11 # define GLM_LANG GLM_LANG_CXX11
#elif defined(GLM_FORCE_CXX03) #elif defined(GLM_FORCE_CXX03)
# undef GLM_FORCE_CXX98
# define GLM_LANG GLM_LANG_CXX03 # define GLM_LANG GLM_LANG_CXX03
#elif defined(GLM_FORCE_CXX98) #elif defined(GLM_FORCE_CXX98)
# define GLM_LANG GLM_LANG_CXX98 # define GLM_LANG GLM_LANG_CXX98

@ -72,6 +72,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
##### Improvements: ##### Improvements:
- Added Visual C++ 15 detection - Added Visual C++ 15 detection
- Added Clang 4.0 detection - Added Clang 4.0 detection
- Added warning messages when using GLM_FORCE_CXX** but the compiler
is known to not fully support the requested C++ version #555
- Refactored GLM_COMPILER_VC values - Refactored GLM_COMPILER_VC values
##### Fixes: ##### Fixes:

Loading…
Cancel
Save