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

- Updated list of compiler versions detected

Browse Source
This commit is contained in:
Christophe Riccio 2016-07-15 23:49:20 +02:00
parent 09cbd5f7d6
commit 76fce77337
3 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
glm/detail/setup.hpp
View File

@ -152,7 +152,14 @@
#define GLM_COMPILER_GCC51 0x02000300 #define GLM_COMPILER_GCC51 0x02000300
#define GLM_COMPILER_GCC52 0x02000400 #define GLM_COMPILER_GCC52 0x02000400
#define GLM_COMPILER_GCC53 0x02000500 #define GLM_COMPILER_GCC53 0x02000500
#define GLM_COMPILER_GCC60 0x02000600 #define GLM_COMPILER_GCC54 0x02000600
#define GLM_COMPILER_GCC60 0x02000700
#define GLM_COMPILER_GCC61 0x02000800
#define GLM_COMPILER_GCC62 0x02000900
#define GLM_COMPILER_GCC70 0x02000A00
#define GLM_COMPILER_GCC71 0x02000B00
#define GLM_COMPILER_GCC72 0x02000C00
#define GLM_COMPILER_GCC80 0x02000D00
// CUDA // CUDA
#define GLM_COMPILER_CUDA 0x10000000 #define GLM_COMPILER_CUDA 0x10000000
@ -164,6 +171,7 @@
#define GLM_COMPILER_CUDA65 0x10000090 #define GLM_COMPILER_CUDA65 0x10000090
#define GLM_COMPILER_CUDA70 0x100000A0 #define GLM_COMPILER_CUDA70 0x100000A0
#define GLM_COMPILER_CUDA75 0x100000B0 #define GLM_COMPILER_CUDA75 0x100000B0
#define GLM_COMPILER_CUDA80 0x100000C0
// LLVM // LLVM
#define GLM_COMPILER_LLVM 0x20000000 #define GLM_COMPILER_LLVM 0x20000000
@ -185,6 +193,9 @@
#define GLM_COMPILER_APPLE_CLANG51 0x40000050 #define GLM_COMPILER_APPLE_CLANG51 0x40000050
#define GLM_COMPILER_APPLE_CLANG60 0x40000060 #define GLM_COMPILER_APPLE_CLANG60 0x40000060
#define GLM_COMPILER_APPLE_CLANG61 0x40000070 #define GLM_COMPILER_APPLE_CLANG61 0x40000070
#define GLM_COMPILER_APPLE_CLANG70 0x40000080
#define GLM_COMPILER_APPLE_CLANG73 0x40000090
#define GLM_COMPILER_APPLE_CLANG80 0x400000A0
// Build model // Build model
#define GLM_MODEL_32 0x00000010 #define GLM_MODEL_32 0x00000010
@ -255,8 +266,12 @@
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG60 # define GLM_COMPILER GLM_COMPILER_APPLE_CLANG60
# elif __clang_major__ == 6 && __clang_minor__ >= 1 # elif __clang_major__ == 6 && __clang_minor__ >= 1
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG61 # define GLM_COMPILER GLM_COMPILER_APPLE_CLANG61
# elif __clang_major__ >= 7 # elif __clang_major__ == 7 && __clang_minor__ == 0
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG61 # define GLM_COMPILER GLM_COMPILER_APPLE_CLANG70
# elif __clang_major__ == 7 && __clang_minor__ >= 3
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG73
# elif __clang_major__ >= 8
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG80
# else # else
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG # define GLM_COMPILER GLM_COMPILER_APPLE_CLANG
# endif # endif
@ -312,10 +327,24 @@
# define GLM_COMPILER (GLM_COMPILER_GCC51) # define GLM_COMPILER (GLM_COMPILER_GCC51)
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 2) # elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 2)
# define GLM_COMPILER (GLM_COMPILER_GCC52) # define GLM_COMPILER (GLM_COMPILER_GCC52)
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3) # elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 3)
# define GLM_COMPILER (GLM_COMPILER_GCC53) # define GLM_COMPILER (GLM_COMPILER_GCC53)
# elif (__GNUC__ >= 6) # elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 4)
# define GLM_COMPILER (GLM_COMPILER_GCC54)
# elif (__GNUC__ == 6) && (__GNUC_MINOR__ == 0)
# define GLM_COMPILER (GLM_COMPILER_GCC60) # define GLM_COMPILER (GLM_COMPILER_GCC60)
# elif (__GNUC__ == 6) && (__GNUC_MINOR__ == 1)
# define GLM_COMPILER (GLM_COMPILER_GCC61)
# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 2)
# define GLM_COMPILER (GLM_COMPILER_GCC62)
# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 0)
# define GLM_COMPILER (GLM_COMPILER_GCC70)
# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 1)
# define GLM_COMPILER (GLM_COMPILER_GCC71)
# elif (__GNUC__ == 7) && (__GNUC_MINOR__ == 2)
# define GLM_COMPILER (GLM_COMPILER_GCC72)
# elif (__GNUC__ >= 8)
# define GLM_COMPILER (GLM_COMPILER_GCC80)
# else # else
# define GLM_COMPILER (GLM_COMPILER_GCC) # define GLM_COMPILER (GLM_COMPILER_GCC)
# endif # endif

1
readme.md
View File

@ -54,6 +54,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
#### [GLM 0.9.7.6](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX #### [GLM 0.9.7.6](https://github.com/g-truc/glm/tree/0.9.7) - 2016-0X-XX
##### Improvements: ##### Improvements:
- Added pkg-config file #509 - Added pkg-config file #509
- Updated list of compiler versions detected
##### Fixes: ##### Fixes:
- Fixed STL for C++11 detection on ICC #510 - Fixed STL for C++11 detection on ICC #510

27
test/core/core_setup_message.cpp
View File

@ -71,9 +71,30 @@ int test_compiler()
case GLM_COMPILER_GCC53: case GLM_COMPILER_GCC53:
std::printf("GLM_COMPILER_GCC53\n"); std::printf("GLM_COMPILER_GCC53\n");
break; break;
case GLM_COMPILER_GCC54:
std::printf("GLM_COMPILER_GCC54\n");
break;
case GLM_COMPILER_GCC60: case GLM_COMPILER_GCC60:
std::printf("GLM_COMPILER_GCC60\n"); std::printf("GLM_COMPILER_GCC60\n");
break; break;
case GLM_COMPILER_GCC61:
std::printf("GLM_COMPILER_GCC61\n");
break;
case GLM_COMPILER_GCC62:
std::printf("GLM_COMPILER_GCC62\n");
break;
case GLM_COMPILER_GCC70:
std::printf("GLM_COMPILER_GCC70\n");
break;
case GLM_COMPILER_GCC71:
std::printf("GLM_COMPILER_GCC71\n");
break;
case GLM_COMPILER_GCC72:
std::printf("GLM_COMPILER_GCC72\n");
break;
case GLM_COMPILER_GCC80:
std::printf("GLM_COMPILER_GCC80\n");
break;
default: default:
std::printf("GCC version not detected\n"); std::printf("GCC version not detected\n");
Error += 1; Error += 1;
@ -109,6 +130,12 @@ int test_compiler()
case GLM_COMPILER_APPLE_CLANG61: case GLM_COMPILER_APPLE_CLANG61:
std::printf("GLM_COMPILER_APPLE_CLANG61\n"); std::printf("GLM_COMPILER_APPLE_CLANG61\n");
break; break;
case GLM_COMPILER_APPLE_CLANG70:
std::printf("GLM_COMPILER_APPLE_CLANG70\n");
break;
case GLM_COMPILER_APPLE_CLANG73:
std::printf("GLM_COMPILER_APPLE_CLANG73\n");
break;
default: default:
std::printf("Apple Clang version not detected\n"); std::printf("Apple Clang version not detected\n");
break; break;