matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jacob1 2012-12-28 22:22:05 -05:00
commit 8945b5ec77
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConscript
View File

@ -156,7 +156,7 @@ if(GetOption('lin')):
env.Append(LIBS=['X11', 'rt']) env.Append(LIBS=['X11', 'rt'])
env.Append(CPPDEFINES=["LIN"]) env.Append(CPPDEFINES=["LIN"])
if GetOption('_64bit'): if GetOption('_64bit'):
env.Append(LINKFAGS=['-m64']) env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
else: else:
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=['-m32'])
@ -176,7 +176,7 @@ if(GetOption('macosx')):
#env.Append(LINKFLAGS=['-framework Lua']) #env.Append(LINKFLAGS=['-framework Lua'])
#env.Append(LINKFLAGS=['-framework Cocoa']) #env.Append(LINKFLAGS=['-framework Cocoa'])
if GetOption('_64bit'): if GetOption('_64bit'):
env.Append(LINKFAGS=['-m64']) env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
else: else:
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=['-m32'])

4
src/Misc.cpp
View File

@ -279,7 +279,7 @@ void *file_load(char *fn, int *size)
int cpu_check(void) int cpu_check(void)
{ {
#ifdef MACOSX /*#ifdef MACOSX
return 0; return 0;
#else #else
#ifdef X86 #ifdef X86
@ -301,7 +301,7 @@ int cpu_check(void)
return 1; return 1;
#endif #endif
#endif #endif
#endif #endif*/
return 0; return 0;
} }