- Improved C++ 11 STL detection #523
This commit is contained in:
parent
76fce77337
commit
2087606611
@ -681,15 +681,8 @@
|
|||||||
// http://gcc.gnu.org/projects/cxx0x.html
|
// http://gcc.gnu.org/projects/cxx0x.html
|
||||||
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
|
// http://msdn.microsoft.com/en-us/library/vstudio/hh567368(v=vs.120).aspx
|
||||||
|
|
||||||
#if GLM_PLATFORM == GLM_PLATFORM_ANDROID || GLM_PLATFORM == GLM_PLATFORM_CYGWIN
|
#if GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
|
||||||
# define GLM_HAS_CXX11_STL 0
|
# if defined(_LIBCPP_VERSION) && GLM_LANG & GLM_LANG_CXX11_FLAG
|
||||||
#elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
|
|
||||||
# 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
|
# define GLM_HAS_CXX11_STL 1
|
||||||
# else
|
# else
|
||||||
# define GLM_HAS_CXX11_STL 0
|
# define GLM_HAS_CXX11_STL 0
|
||||||
|
@ -55,6 +55,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
|
|||||||
##### Improvements:
|
##### Improvements:
|
||||||
- Added pkg-config file #509
|
- Added pkg-config file #509
|
||||||
- Updated list of compiler versions detected
|
- Updated list of compiler versions detected
|
||||||
|
- Improved C++ 11 STL detection #523
|
||||||
|
|
||||||
##### Fixes:
|
##### Fixes:
|
||||||
- Fixed STL for C++11 detection on ICC #510
|
- Fixed STL for C++11 detection on ICC #510
|
||||||
|
Loading…
x
Reference in New Issue
Block a user