Browse Source

Fixed GLM_HAS_CXX11_STL broken on Clang with Linux #926

Christophe Riccio 6 năm trước cách đây
mục cha
commit
79787bbff6
2 tập tin đã thay đổi với 2 bổ sung2 xóa
  1. 1 2
      glm/detail/setup.hpp
  2. 1 0
      readme.md

+ 1 - 2
glm/detail/setup.hpp

@@ -143,8 +143,7 @@
 #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
 #if GLM_PLATFORM == GLM_PLATFORM_ANDROID && !defined(GLM_LANG_STL11_FORCED)
 #	define GLM_HAS_CXX11_STL 0
 #	define GLM_HAS_CXX11_STL 0
 #elif GLM_COMPILER & GLM_COMPILER_CLANG
 #elif GLM_COMPILER & GLM_COMPILER_CLANG
-#	if ((defined(_LIBCPP_VERSION) || defined(_MSC_VER)) && GLM_LANG & GLM_LANG_CXX11_FLAG) || \
-		defined(GLM_LANG_STL11_FORCED)
+#	if (defined(_LIBCPP_VERSION) || (GLM_LANG & GLM_LANG_CXX11_FLAG) || defined(GLM_LANG_STL11_FORCED))
 #		define GLM_HAS_CXX11_STL 1
 #		define GLM_HAS_CXX11_STL 1
 #	else
 #	else
 #		define GLM_HAS_CXX11_STL 0
 #		define GLM_HAS_CXX11_STL 0

+ 1 - 0
readme.md

@@ -71,6 +71,7 @@ glm::mat4 camera(float Translate, glm::vec2 const& Rotate)
 - Fixed missing const to quaternion conversion operators #890
 - Fixed missing const to quaternion conversion operators #890
 - 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
 
 
 ### [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: