|
@@ -22,9 +22,9 @@
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
// Compiler
|
|
// Compiler
|
|
|
|
|
|
|
|
-// User defines: GLM_FORCE_COMPILER_UNKNOWNED
|
|
|
|
|
|
|
+// User defines: GLM_FORCE_COMPILER_UNKNOWN
|
|
|
|
|
|
|
|
-#define GLM_COMPILER_UNKNOWNED 0x00000000
|
|
|
|
|
|
|
+#define GLM_COMPILER_UNKNOWN 0x00000000
|
|
|
|
|
|
|
|
// Visual C++ defines
|
|
// Visual C++ defines
|
|
|
#define GLM_COMPILER_VC 0x01000000
|
|
#define GLM_COMPILER_VC 0x01000000
|
|
@@ -76,8 +76,8 @@
|
|
|
#define GLM_COMPILER_CODEWARRIOR 0x04000000
|
|
#define GLM_COMPILER_CODEWARRIOR 0x04000000
|
|
|
|
|
|
|
|
// Force generic C++ compiler
|
|
// Force generic C++ compiler
|
|
|
-#ifdef GLM_FORCE_COMPILER_UNKNOWNED
|
|
|
|
|
-# define GLM_COMPILER GLM_COMPILER_UNKNOWNED
|
|
|
|
|
|
|
+#ifdef GLM_FORCE_COMPILER_UNKNOWN
|
|
|
|
|
+# define GLM_COMPILER GLM_COMPILER_UNKNOWN
|
|
|
// Visual C++
|
|
// Visual C++
|
|
|
#elif defined(_MSC_VER)
|
|
#elif defined(_MSC_VER)
|
|
|
# if _MSC_VER == 900
|
|
# if _MSC_VER == 900
|
|
@@ -157,7 +157,7 @@
|
|
|
# define GLM_COMPILER GLM_COMPILER_CODEWARRIOR
|
|
# define GLM_COMPILER GLM_COMPILER_CODEWARRIOR
|
|
|
|
|
|
|
|
#else
|
|
#else
|
|
|
-# define GLM_COMPILER GLM_COMPILER_UNKNOWNED
|
|
|
|
|
|
|
+# define GLM_COMPILER GLM_COMPILER_UNKNOWN
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef GLM_COMPILER
|
|
#ifndef GLM_COMPILER
|
|
@@ -350,7 +350,7 @@
|
|
|
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
|
|
# elif(GLM_COMPONENT == GLM_COMPONENT_MS_EXT)
|
|
|
# pragma message("GLM: Multiple vector component names through Visual C++ language extensions")
|
|
# pragma message("GLM: Multiple vector component names through Visual C++ language extensions")
|
|
|
# else
|
|
# else
|
|
|
-# error "GLM_COMPONENT value unknowned"
|
|
|
|
|
|
|
+# error "GLM_COMPONENT value unknown"
|
|
|
# endif//GLM_MESSAGE_COMPONENT_DISPLAYED
|
|
# endif//GLM_MESSAGE_COMPONENT_DISPLAYED
|
|
|
#endif//GLM_MESSAGE
|
|
#endif//GLM_MESSAGE
|
|
|
|
|
|