AuroraMiddleware/glm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed Clang or GCC build due to wrong GLM_HAS_IF_CONSTEXPR definition #907

Browse Source
This commit is contained in:
Christophe Riccio 2019-09-07 13:52:41 +02:00
parent 61b2a73e21
commit a5fd70aed8
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glm/detail/setup.hpp
View File

@ -294,10 +294,8 @@
// //
#if GLM_HAS_CONSTEXPR #if GLM_HAS_CONSTEXPR
# if (GLM_COMPILER & GLM_COMPILER_CLANG) # if (GLM_COMPILER & GLM_COMPILER_CLANG) && __has_feature(cxx_if_constexpr)
# define GLM_HAS_IF_CONSTEXPR __has_feature(cxx_if_constexpr) # define GLM_HAS_IF_CONSTEXPR 1
# elif (GLM_COMPILER & GLM_COMPILER_GCC)
# define GLM_HAS_IF_CONSTEXPR (__cplusplus >= 201703L)
# elif (GLM_LANG & GLM_LANG_CXX17_FLAG) # elif (GLM_LANG & GLM_LANG_CXX17_FLAG)
# define GLM_HAS_IF_CONSTEXPR 1 # define GLM_HAS_IF_CONSTEXPR 1
# else # else

1
readme.md
View File

@ -73,6 +73,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
- Fixed EXT_scalar_ulp and EXT_vector_ulp API coding style - Fixed EXT_scalar_ulp and EXT_vector_ulp API coding style
- Fixed quaternion componant order: w, {x, y, z} #916 - Fixed quaternion componant order: w, {x, y, z} #916
- Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926 - Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926
- Fixed Clang or GCC build due to wrong GLM_HAS_IF_CONSTEXPR definition #907
### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01 ### [GLM 0.9.9.5](https://github.com/g-truc/glm/releases/tag/0.9.9.5) - 2019-04-01
#### Fixes: #### Fixes: