Commit e98ce44 1 parent e1b88a0 commit e98ce44 Copy full SHA for e98ce44
File tree 2 files changed +16
-6
lines changed
2 files changed +16
-6
lines changed Original file line number Diff line number Diff line change 142
142
#define GLM_LANG_CXXGNU GLM_LANG_CXXGNU_FLAG
143
143
144
144
#if defined(GLM_FORCE_CXX14)
145
- # undef GLM_FORCE_CXX11
146
- # undef GLM_FORCE_CXX03
147
- # undef GLM_FORCE_CXX98
145
+ # if ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER <= GLM_COMPILER_GCC50)) || ((GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER <= GLM_COMPILER_CLANG34))
146
+ # pragma message("GLM: Using GLM_FORCE_CXX14 with a compiler that doesn't fully support C++14")
147
+ # elif GLM_COMPILER & GLM_COMPILER_VC
148
+ # pragma message("GLM: Using GLM_FORCE_CXX14 but there is no known version of Visual C++ compiler that fully supports C++14")
149
+ # elif GLM_COMPILER & GLM_COMPILER_INTEL
150
+ # pragma message("GLM: Using GLM_FORCE_CXX14 but there is no known version of ICC compiler that fully supports C++14")
151
+ # endif
148
152
# define GLM_LANG GLM_LANG_CXX14
149
153
#elif defined(GLM_FORCE_CXX11)
150
- # undef GLM_FORCE_CXX03
151
- # undef GLM_FORCE_CXX98
154
+ # if ((GLM_COMPILER & GLM_COMPILER_GCC) && (GLM_COMPILER <= GLM_COMPILER_GCC48)) || ((GLM_COMPILER & GLM_COMPILER_CLANG) && (GLM_COMPILER <= GLM_COMPILER_CLANG33))
155
+ # pragma message("GLM: Using GLM_FORCE_CXX11 with a compiler that doesn't fully support C++11")
156
+ # elif GLM_COMPILER & GLM_COMPILER_VC
157
+ # pragma message("GLM: Using GLM_FORCE_CXX11 but there is no known version of Visual C++ compiler that fully supports C++11")
158
+ # elif GLM_COMPILER & GLM_COMPILER_INTEL
159
+ # pragma message("GLM: Using GLM_FORCE_CXX11 but there is no known version of ICC compiler that fully supports C++11")
160
+ # endif
152
161
# define GLM_LANG GLM_LANG_CXX11
153
162
#elif defined(GLM_FORCE_CXX03)
154
- # undef GLM_FORCE_CXX98
155
163
# define GLM_LANG GLM_LANG_CXX03
156
164
#elif defined(GLM_FORCE_CXX98)
157
165
# define GLM_LANG GLM_LANG_CXX98
Original file line number Diff line number Diff line change @@ -55,6 +55,8 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
55
55
##### Improvements:
56
56
- Added Visual C++ 15 detection
57
57
- Added Clang 4.0 detection
58
+ - Added warning messages when using GLM_FORCE_CXX** but the compiler
59
+ is known to not fully support the requested C++ version #555
58
60
- Refactored GLM_COMPILER_VC values
59
61
60
62
##### Fixes:
You can’t perform that action at this time.
0 commit comments