mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-23 17:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ICC on Linux build errors #449

Browse Source
This commit is contained in:
Christophe Riccio 2016-01-03 17:10:24 +01:00
parent 2f2782d72a
commit 7a1c042d8b
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
glm/detail/setup.hpp
View File

@ -574,22 +574,18 @@
# ifdef _MSC_EXTENSIONS # ifdef _MSC_EXTENSIONS
# define GLM_MSC_EXT GLM_LANG_CXXMS_FLAG # define GLM_MSC_EXT GLM_LANG_CXXMS_FLAG
# else # else
# define GLM_MSC_EXT # define GLM_MSC_EXT 0
# endif # endif
# if __INTEL_CXX11_MODE__
# if __cplusplus >= 201402L # if __cplusplus >= 201402L
# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX14 | GLM_MSC_EXT)
# elif __cplusplus >= 201103L # elif __cplusplus >= 201103L
# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX11 | GLM_MSC_EXT)
# elif __INTEL_CXX11_MODE__
# define GLM_LANG (GLM_LANG_CXX0X | GLM_MSC_EXT)
# elif __cplusplus >= 199711L
# define GLM_LANG (GLM_LANG_CXX98 | GLM_MSC_EXT)
# else # else
# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX | GLM_MSC_EXT)
# endif
# else
# if __cplusplus >= 199711L
# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
# else
# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
# endif
# endif # endif
# else // Unkown compiler # else // Unkown compiler
# if __cplusplus >= 201402L # if __cplusplus >= 201402L