mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-10 04:31:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Intel compiler build error on Linux #354

Browse Source
This commit is contained in:
Christophe Riccio 2015-07-19 17:38:41 +02:00
parent 1e0cf75b2f
commit 9e2f6dfc7f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
glm/detail/setup.hpp
View File

@ -537,12 +537,13 @@
#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 | GLM_COMPILER_INTEL) #elif GLM_COMPILER & (GLM_COMPILER_LLVM | GLM_COMPILER_APPLE_CLANG)
# define GLM_HAS_CXX11_STL __has_include("__config") # define GLM_HAS_CXX11_STL __has_include("__config")
#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)))
#endif #endif
// N1720 // N1720

1
readme.md
View File

@ -76,6 +76,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
- Fixed perspective fovy argument documentation #327 - Fixed perspective fovy argument documentation #327
- 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
##### Deprecation: ##### Deprecation:
- Removed integer specification for 'mod' in GTC_integer #308 - Removed integer specification for 'mod' in GTC_integer #308