mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-11-26 10:14:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed model, 32/64bits detection on MacOS X

Browse Source
This commit is contained in:
Christophe Riccio 2011-12-18 20:05:02 +00:00
parent 7833ec3369
commit 1625a495a8
2 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glm/core/setup.hpp
View File

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

2
test/core/core_setup_message.cpp
View File

@ -13,7 +13,7 @@
int test_compiler() int test_compiler()
{ {
int Error = 0; int Error(0);
switch(GLM_COMPILER) switch(GLM_COMPILER)
{ {