Fixed use of libstdc++ with Clang #351

master
Christophe Riccio ago%!(EXTRA string=10 years)
parent 9e2f6dfc7f
commit ac21d7bdad
  1. 11
      glm/detail/setup.hpp
  2. 1
      readme.md

@ -538,7 +538,16 @@
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID #if GLM_PLATFORM == GLM_PLATFORM_ANDROID
# define GLM_HAS_CXX11_STL 0 # define GLM_HAS_CXX11_STL 0
#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG) #elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
# define GLM_HAS_CXX11_STL __has_include("__config") # if __has_include(<__config>) // libc++
# include <__config>
//# else // libstdc++
//# include <bits/c++config.h>
# endif
# if defined(_LIBCPP_VERSION)// || defined(__GLIBCXX__)
# define GLM_HAS_CXX11_STL 1
# else
# define GLM_HAS_CXX11_STL 0
# endif
#else #else
# define GLM_HAS_CXX11_STL ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && \ # define GLM_HAS_CXX11_STL ((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)) || \

@ -77,6 +77,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Removed -m64 causing build issues on Linux 32 #331 - Removed -m64 causing build issues on Linux 32 #331
- Fixed isfinite with C++98 compilers #343 - Fixed isfinite with C++98 compilers #343
- Fixed Intel compiler build error on Linux #354 - Fixed Intel compiler build error on Linux #354
- Fixed use of libstdc++ with Clang #351
##### Deprecation: ##### Deprecation:
- Removed integer specification for 'mod' in GTC_integer #308 - Removed integer specification for 'mod' in GTC_integer #308

Loading…
Cancel
Save