mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-12 21:31:47 +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 adb03bee5c
commit a754ab2e7e
1 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
glm/detail/setup.hpp
View File

@ -577,29 +577,20 @@
# endif # endif
# elif GLM_COMPILER & GLM_COMPILER_INTEL # elif GLM_COMPILER & GLM_COMPILER_INTEL
# ifdef _MSC_EXTENSIONS # ifdef _MSC_EXTENSIONS
# if __cplusplus >= 201402L # define GLM_MSC_EXT GLM_LANG_CXXMS_FLAG
# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG)
# elif __cplusplus >= 201103L
# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG)
# elif GLM_COMPILER >= GLM_COMPILER_INTEL13
# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
# elif __cplusplus >= 199711L
# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
# else
# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG)
# endif
# else # else
# if __cplusplus >= 201402L # define GLM_MSC_EXT 0
# define GLM_LANG (GLM_LANG_CXX14 | GLM_LANG_CXXMS_FLAG) # endif
# elif __cplusplus >= 201103L # if __cplusplus >= 201402L
# define GLM_LANG (GLM_LANG_CXX11 | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX14 | GLM_MSC_EXT)
# elif GLM_COMPILER >= GLM_COMPILER_INTEL13 # elif __cplusplus >= 201103L
# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX11 | GLM_MSC_EXT)
# elif __cplusplus >= 199711L # elif __INTEL_CXX11_MODE__
# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX0X | GLM_MSC_EXT)
# else # elif __cplusplus >= 199711L
# define GLM_LANG (GLM_LANG_CXX | GLM_LANG_CXXMS_FLAG) # define GLM_LANG (GLM_LANG_CXX98 | GLM_MSC_EXT)
# endif # else
# define GLM_LANG (GLM_LANG_CXX | GLM_MSC_EXT)
# endif # endif
# else // Unkown compiler # else // Unkown compiler
# if __cplusplus >= 201402L # if __cplusplus >= 201402L