mewin/glm
1
0
Fork 0
Code Releases Activity

Improved Intel Compiler detection

Browse Source
This commit is contained in:
Christophe Riccio
2013-02-01 00:45:24 +01:00
parent db5a610882
commit 1cebfa7bda
3 changed files with 44 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
glm/core/setup.hpp
View File

@@ -471,6 +471,20 @@
# define GLM_LANG GLM_LANG_CXX98
# endif
# endif
# elif(GLM_COMPILER & GLM_COMPILER_INTEL)
# if(defined(_MSC_EXTENSIONS))
# if(GLM_COMPILER >= GLM_COMPILER_INTEL13_0)
# define GLM_LANG (GLM_LANG_CXX0X | GLM_LANG_CXXMS_FLAG)
# else
# define GLM_LANG (GLM_LANG_CXX98 | GLM_LANG_CXXMS_FLAG)
# endif
# else
# if(GLM_COMPILER >= GLM_COMPILER_INTEL13_0)
# define GLM_LANG (GLM_LANG_CXX0X)
# else
# define GLM_LANG (GLM_LANG_CXX98)
# endif
# endif
# elif((GLM_COMPILER & GLM_COMPILER_CLANG) == GLM_COMPILER_CLANG)
# define GLM_LANG GLM_LANG_CXX98
# else
@@ -481,9 +495,9 @@
#if(defined(GLM_MESSAGES) && !defined(GLM_MESSAGE_LANG_DISPLAYED))
# define GLM_MESSAGE_LANG_DISPLAYED
# if(GLM_LANG & GLM_LANG_CXXGNU_FLAG)
# pragma message("GLM: C++ with GNU language extensions")
# pragma message("GLM: C++ with language extensions")
# elif(GLM_LANG & GLM_LANG_CXXMS_FLAG)
# pragma message("GLM: C++ with VC language extensions")
# pragma message("GLM: C++ with language extensions")
# elif(GLM_LANG & GLM_LANG_CXX11_FLAG)
# pragma message("GLM: C++11")
# elif(GLM_LANG & GLM_LANG_CXX0X_FLAG)
@@ -611,7 +625,7 @@
(GLM_LANG & GLM_LANG_CXX98_FLAG)
#define GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE() \
(GLM_LANG & GLM_LANG_CXXMS_FLAG)
((GLM_LANG & GLM_LANG_CXXMS_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC))
#define GLM_SUPPORT_SWIZZLE_OPERATOR() \
(defined(GLM_SWIZZLE) && GLM_SUPPORT_ANONYMOUS_UNION_OF_STRUCTURE())