|
|
@@ -154,8 +154,6 @@
|
|
|
#define GLM_COMPILER_GCC46 0x020000D0
|
|
|
#define GLM_COMPILER_GCC47 0x020000E0
|
|
|
#define GLM_COMPILER_GCC48 0x020000F0
|
|
|
-#define GLM_COMPILER_GCC49 0x02000100
|
|
|
-#define GLM_COMPILER_GCC50 0x02000200
|
|
|
|
|
|
// G++ command line to display defined
|
|
|
// echo "" | g++ -E -dM -x c++ - | sort
|
|
|
@@ -237,18 +235,8 @@
|
|
|
|
|
|
// Visual C++
|
|
|
#elif defined(_MSC_VER)
|
|
|
-# if _MSC_VER == 900
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC2
|
|
|
-# elif _MSC_VER == 1000
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC4
|
|
|
-# elif _MSC_VER == 1100
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC5
|
|
|
-# elif _MSC_VER == 1200
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC6
|
|
|
-# elif _MSC_VER == 1300
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC2002
|
|
|
-# elif _MSC_VER == 1310
|
|
|
-# define GLM_COMPILER GLM_COMPILER_VC2003
|
|
|
+# if _MSC_VER < 1400
|
|
|
+# error "GLM requires Visual C++ 2005 or higher"
|
|
|
# elif _MSC_VER == 1400
|
|
|
# define GLM_COMPILER GLM_COMPILER_VC2005
|
|
|
# elif _MSC_VER == 1500
|
|
|
@@ -265,7 +253,9 @@
|
|
|
|
|
|
// Clang
|
|
|
#elif defined(__clang__)
|
|
|
-# if(__clang_major__ == 2) && (__clang_minor__ == 6)
|
|
|
+# if (__clang_major__ <= 1) || ((__clang_major__ == 2) && (__clang_minor__ < 6))
|
|
|
+# error "GLM requires Clang 2.6 or higher"
|
|
|
+# elif(__clang_major__ == 2) && (__clang_minor__ == 6)
|
|
|
# define GLM_COMPILER GLM_COMPILER_CLANG26
|
|
|
# elif(__clang_major__ == 2) && (__clang_minor__ == 7)
|
|
|
# define GLM_COMPILER GLM_COMPILER_CLANG27
|
|
|
@@ -333,17 +323,7 @@
|
|
|
|
|
|
// Borland C++
|
|
|
#elif defined(_BORLANDC_)
|
|
|
-# if defined(VER125)
|
|
|
-# define GLM_COMPILER GLM_COMPILER_BCB4
|
|
|
-# elif defined(VER130)
|
|
|
-# define GLM_COMPILER GLM_COMPILER_BCB5
|
|
|
-# elif defined(VER140)
|
|
|
-# define GLM_COMPILER GLM_COMPILER_BCB6
|
|
|
-# elif defined(VER200)
|
|
|
-# define GLM_COMPILER GLM_COMPILER_BCB2009
|
|
|
-# else
|
|
|
-# define GLM_COMPILER GLM_COMPILER_BC
|
|
|
-# endif
|
|
|
+# define GLM_COMPILER GLM_COMPILER_BC
|
|
|
|
|
|
// Codewarrior
|
|
|
#elif defined(__MWERKS__)
|