|
|
@@ -393,18 +393,10 @@
|
|
|
/////////////////
|
|
|
// Build model //
|
|
|
|
|
|
-#if(GLM_COMPILER & GLM_COMPILER_VC)
|
|
|
-# if defined(_M_X64)
|
|
|
+#if((defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(_M_X64) || defined(__ppc64__) || defined(__x86_64__))
|
|
|
# define GLM_MODEL GLM_MODEL_64
|
|
|
-# else
|
|
|
-# define GLM_MODEL GLM_MODEL_32
|
|
|
-# endif//_M_X64
|
|
|
-#elif(GLM_COMPILER & GLM_COMPILER_GCC)
|
|
|
-# if(defined(__WORDSIZE) && (__WORDSIZE == 64)) || defined(__arch64__) || defined(__LP64__) || defined(__x86_64__)
|
|
|
-# define GLM_MODEL GLM_MODEL_64
|
|
|
-# else
|
|
|
-# define GLM_MODEL GLM_MODEL_32
|
|
|
-# endif//
|
|
|
+#elif(defined(__i386__) || defined(__ppc__))
|
|
|
+# define GLM_MODEL GLM_MODEL_32
|
|
|
#else
|
|
|
# define GLM_MODEL GLM_MODEL_32
|
|
|
#endif//
|