mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 18:24:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed STL for C++11 detection on ICC #510

Browse Source
This commit is contained in:
Christophe Riccio 2016-06-04 23:08:08 +02:00
parent fe6ab8f3b6
commit 39e63661a6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/setup.hpp
View File

@ -666,10 +666,10 @@
# define GLM_HAS_CXX11_STL 0 # define GLM_HAS_CXX11_STL 0
# endif # 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)) || \
((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \ ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013)) || \
((GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15))) ((GLM_PLATFORM != GLM_PLATFORM_WINDOWS) && (GLM_COMPILER & GLM_COMPILER_INTEL) && (GLM_COMPILER >= GLM_COMPILER_INTEL15))))
#endif #endif
// N1720 // N1720

3
readme.md
View File

@ -55,6 +55,9 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
##### Improvements: ##### Improvements:
- Added pkg-config file #509 - Added pkg-config file #509
##### Fixes:
- Fixed STL for C++11 detection on ICC #510
#### [GLM 0.9.7.5](https://github.com/g-truc/glm/releases/tag/0.9.7.5) - 2016-05-24 #### [GLM 0.9.7.5](https://github.com/g-truc/glm/releases/tag/0.9.7.5) - 2016-05-24
##### Improvements: ##### Improvements:
- Added Visual C++ Clang toolset detection - Added Visual C++ Clang toolset detection