mirror of
https://github.com/g-truc/glm.git
synced 2024-11-26 10:14:35 +00:00
Updated list of compiler versions
This commit is contained in:
parent
9539174494
commit
dcfddb75b8
@ -128,6 +128,7 @@
|
|||||||
#define GLM_COMPILER_INTEL13 0x00100030
|
#define GLM_COMPILER_INTEL13 0x00100030
|
||||||
#define GLM_COMPILER_INTEL14 0x00100040
|
#define GLM_COMPILER_INTEL14 0x00100040
|
||||||
#define GLM_COMPILER_INTEL15 0x00100050
|
#define GLM_COMPILER_INTEL15 0x00100050
|
||||||
|
#define GLM_COMPILER_INTEL16 0x00100060
|
||||||
|
|
||||||
// Visual C++ defines
|
// Visual C++ defines
|
||||||
#define GLM_COMPILER_VC 0x01000000
|
#define GLM_COMPILER_VC 0x01000000
|
||||||
@ -145,6 +146,9 @@
|
|||||||
#define GLM_COMPILER_GCC48 0x020000F0
|
#define GLM_COMPILER_GCC48 0x020000F0
|
||||||
#define GLM_COMPILER_GCC49 0x02000100
|
#define GLM_COMPILER_GCC49 0x02000100
|
||||||
#define GLM_COMPILER_GCC50 0x02000200
|
#define GLM_COMPILER_GCC50 0x02000200
|
||||||
|
#define GLM_COMPILER_GCC51 0x02000300
|
||||||
|
#define GLM_COMPILER_GCC52 0x02000400
|
||||||
|
#define GLM_COMPILER_GCC53 0x02000500
|
||||||
|
|
||||||
// CUDA
|
// CUDA
|
||||||
#define GLM_COMPILER_CUDA 0x10000000
|
#define GLM_COMPILER_CUDA 0x10000000
|
||||||
@ -154,6 +158,8 @@
|
|||||||
#define GLM_COMPILER_CUDA50 0x10000070
|
#define GLM_COMPILER_CUDA50 0x10000070
|
||||||
#define GLM_COMPILER_CUDA60 0x10000080
|
#define GLM_COMPILER_CUDA60 0x10000080
|
||||||
#define GLM_COMPILER_CUDA65 0x10000090
|
#define GLM_COMPILER_CUDA65 0x10000090
|
||||||
|
#define GLM_COMPILER_CUDA70 0x100000A0
|
||||||
|
#define GLM_COMPILER_CUDA75 0x100000B0
|
||||||
|
|
||||||
// LLVM
|
// LLVM
|
||||||
#define GLM_COMPILER_LLVM 0x20000000
|
#define GLM_COMPILER_LLVM 0x20000000
|
||||||
@ -161,6 +167,10 @@
|
|||||||
#define GLM_COMPILER_LLVM33 0x20000040
|
#define GLM_COMPILER_LLVM33 0x20000040
|
||||||
#define GLM_COMPILER_LLVM34 0x20000050
|
#define GLM_COMPILER_LLVM34 0x20000050
|
||||||
#define GLM_COMPILER_LLVM35 0x20000060
|
#define GLM_COMPILER_LLVM35 0x20000060
|
||||||
|
#define GLM_COMPILER_LLVM36 0x20000070
|
||||||
|
#define GLM_COMPILER_LLVM37 0x20000080
|
||||||
|
#define GLM_COMPILER_LLVM38 0x20000090
|
||||||
|
#define GLM_COMPILER_LLVM39 0x200000A0
|
||||||
|
|
||||||
// Apple Clang
|
// Apple Clang
|
||||||
#define GLM_COMPILER_APPLE_CLANG 0x40000000
|
#define GLM_COMPILER_APPLE_CLANG 0x40000000
|
||||||
@ -170,6 +180,7 @@
|
|||||||
#define GLM_COMPILER_APPLE_CLANG50 0x40000040
|
#define GLM_COMPILER_APPLE_CLANG50 0x40000040
|
||||||
#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
|
||||||
|
|
||||||
// Build model
|
// Build model
|
||||||
#define GLM_MODEL_32 0x00000010
|
#define GLM_MODEL_32 0x00000010
|
||||||
@ -190,6 +201,8 @@
|
|||||||
# define GLM_COMPILER GLM_COMPILER_INTEL14
|
# define GLM_COMPILER GLM_COMPILER_INTEL14
|
||||||
# elif __INTEL_COMPILER >= 1500
|
# elif __INTEL_COMPILER >= 1500
|
||||||
# define GLM_COMPILER GLM_COMPILER_INTEL15
|
# define GLM_COMPILER GLM_COMPILER_INTEL15
|
||||||
|
# elif __INTEL_COMPILER >= 1600
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_INTEL16
|
||||||
# else
|
# else
|
||||||
# define GLM_COMPILER GLM_COMPILER_INTEL
|
# define GLM_COMPILER GLM_COMPILER_INTEL
|
||||||
# endif
|
# endif
|
||||||
@ -234,8 +247,14 @@
|
|||||||
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG50
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG50
|
||||||
# elif __clang_major__ == 5 && __clang_minor__ == 1
|
# elif __clang_major__ == 5 && __clang_minor__ == 1
|
||||||
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG51
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG51
|
||||||
# elif __clang_major__ >= 6
|
# elif __clang_major__ == 6 && __clang_minor__ == 0
|
||||||
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG60
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG60
|
||||||
|
# elif __clang_major__ == 6 && __clang_minor__ >= 1
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG61
|
||||||
|
# elif __clang_major__ >= 7
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG61
|
||||||
|
# else
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_APPLE_CLANG
|
||||||
# endif
|
# endif
|
||||||
# else
|
# else
|
||||||
# if __clang_major__ == 3 && __clang_minor__ == 0
|
# if __clang_major__ == 3 && __clang_minor__ == 0
|
||||||
@ -250,8 +269,18 @@
|
|||||||
# define GLM_COMPILER GLM_COMPILER_LLVM34
|
# define GLM_COMPILER GLM_COMPILER_LLVM34
|
||||||
# elif __clang_major__ == 3 && __clang_minor__ == 5
|
# elif __clang_major__ == 3 && __clang_minor__ == 5
|
||||||
# define GLM_COMPILER GLM_COMPILER_LLVM35
|
# define GLM_COMPILER GLM_COMPILER_LLVM35
|
||||||
|
# elif __clang_major__ == 3 && __clang_minor__ == 6
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_LLVM36
|
||||||
|
# elif __clang_major__ == 3 && __clang_minor__ == 7
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_LLVM37
|
||||||
|
# elif __clang_major__ == 3 && __clang_minor__ == 8
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_LLVM38
|
||||||
|
# elif __clang_major__ == 3 && __clang_minor__ >= 9
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_LLVM39
|
||||||
|
# elif __clang_major__ >= 4
|
||||||
|
# define GLM_COMPILER GLM_COMPILER_LLVM39
|
||||||
# else
|
# else
|
||||||
# define GLM_COMPILER GLM_COMPILER_LLVM35
|
# define GLM_COMPILER GLM_COMPILER_LLVM
|
||||||
# endif
|
# endif
|
||||||
# endif
|
# endif
|
||||||
|
|
||||||
@ -273,8 +302,14 @@
|
|||||||
# define GLM_COMPILER (GLM_COMPILER_GCC48)
|
# define GLM_COMPILER (GLM_COMPILER_GCC48)
|
||||||
# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)
|
# elif (__GNUC__ == 4) && (__GNUC_MINOR__ >= 9)
|
||||||
# define GLM_COMPILER (GLM_COMPILER_GCC49)
|
# define GLM_COMPILER (GLM_COMPILER_GCC49)
|
||||||
# elif (__GNUC__ > 4 )
|
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 0)
|
||||||
# define GLM_COMPILER (GLM_COMPILER_GCC50)
|
# define GLM_COMPILER (GLM_COMPILER_GCC50)
|
||||||
|
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 1)
|
||||||
|
# define GLM_COMPILER (GLM_COMPILER_GCC51)
|
||||||
|
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ == 2)
|
||||||
|
# define GLM_COMPILER (GLM_COMPILER_GCC52)
|
||||||
|
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)
|
||||||
|
# define GLM_COMPILER (GLM_COMPILER_GCC53)
|
||||||
# else
|
# else
|
||||||
# define GLM_COMPILER (GLM_COMPILER_GCC)
|
# define GLM_COMPILER (GLM_COMPILER_GCC)
|
||||||
# endif
|
# endif
|
||||||
|
@ -67,6 +67,7 @@ glm::mat4 camera(float Translate, glm::vec2 const & Rotate)
|
|||||||
- Don't show status message in 'FindGLM' if 'QUIET' option is set. #317
|
- Don't show status message in 'FindGLM' if 'QUIET' option is set. #317
|
||||||
- Added master branch continuous integration service on Linux 64 #332
|
- Added master branch continuous integration service on Linux 64 #332
|
||||||
- Clarified manual regarding angle unit in GLM, added FAQ 11 #326
|
- Clarified manual regarding angle unit in GLM, added FAQ 11 #326
|
||||||
|
- Updated list of compiler versions
|
||||||
|
|
||||||
##### Fixes:
|
##### Fixes:
|
||||||
- Fixed (u)int64 MSB/LSB handling on BE archs #306
|
- Fixed (u)int64 MSB/LSB handling on BE archs #306
|
||||||
|
@ -62,6 +62,15 @@ int test_compiler()
|
|||||||
case GLM_COMPILER_GCC50:
|
case GLM_COMPILER_GCC50:
|
||||||
std::printf("GLM_COMPILER_GCC50\n");
|
std::printf("GLM_COMPILER_GCC50\n");
|
||||||
break;
|
break;
|
||||||
|
case GLM_COMPILER_GCC51:
|
||||||
|
std::printf("GLM_COMPILER_GCC51\n");
|
||||||
|
break;
|
||||||
|
case GLM_COMPILER_GCC52:
|
||||||
|
std::printf("GLM_COMPILER_GCC52\n");
|
||||||
|
break;
|
||||||
|
case GLM_COMPILER_GCC53:
|
||||||
|
std::printf("GLM_COMPILER_GCC53\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
std::printf("GCC version not detected\n");
|
std::printf("GCC version not detected\n");
|
||||||
Error += 1;
|
Error += 1;
|
||||||
@ -94,6 +103,9 @@ int test_compiler()
|
|||||||
case GLM_COMPILER_APPLE_CLANG60:
|
case GLM_COMPILER_APPLE_CLANG60:
|
||||||
std::printf("GLM_COMPILER_APPLE_CLANG60\n");
|
std::printf("GLM_COMPILER_APPLE_CLANG60\n");
|
||||||
break;
|
break;
|
||||||
|
case GLM_COMPILER_APPLE_CLANG61:
|
||||||
|
std::printf("GLM_COMPILER_APPLE_CLANG61\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
std::printf("Apple Clang version not detected\n");
|
std::printf("Apple Clang version not detected\n");
|
||||||
break;
|
break;
|
||||||
@ -115,6 +127,18 @@ int test_compiler()
|
|||||||
case GLM_COMPILER_LLVM35:
|
case GLM_COMPILER_LLVM35:
|
||||||
std::printf("GLM_COMPILER_LLVM35\n");
|
std::printf("GLM_COMPILER_LLVM35\n");
|
||||||
break;
|
break;
|
||||||
|
case GLM_COMPILER_LLVM36:
|
||||||
|
std::printf("GLM_COMPILER_LLVM36\n");
|
||||||
|
break;
|
||||||
|
case GLM_COMPILER_LLVM37:
|
||||||
|
std::printf("GLM_COMPILER_LLVM37\n");
|
||||||
|
break;
|
||||||
|
case GLM_COMPILER_LLVM38:
|
||||||
|
std::printf("GLM_COMPILER_LLVM38\n");
|
||||||
|
break;
|
||||||
|
case GLM_COMPILER_LLVM39:
|
||||||
|
std::printf("GLM_COMPILER_LLVM39\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
std::printf("LLVM version not detected\n");
|
std::printf("LLVM version not detected\n");
|
||||||
break;
|
break;
|
||||||
@ -139,6 +163,9 @@ int test_compiler()
|
|||||||
case GLM_COMPILER_INTEL15:
|
case GLM_COMPILER_INTEL15:
|
||||||
std::printf("GLM_COMPILER_INTEL15\n");
|
std::printf("GLM_COMPILER_INTEL15\n");
|
||||||
break;
|
break;
|
||||||
|
case GLM_COMPILER_INTEL16:
|
||||||
|
std::printf("GLM_COMPILER_INTEL16\n");
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
std::printf("Intel compiler version not detected\n");
|
std::printf("Intel compiler version not detected\n");
|
||||||
Error += 1;
|
Error += 1;
|
||||||
|
Loading…
Reference in New Issue
Block a user