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

Some modifications for WIN64. SConscript not ready for that yet.

Browse Source
This commit is contained in:
ntoskrnl 2012-07-29 20:33:01 +03:00 committed by Simon Robertshaw
parent f94fabd999
commit 4343faa10f
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConscript
View File

@ -119,13 +119,15 @@ 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(CPPDEFINES=["_64BIT"])
env.Append(LINKFAGS=['-m64']) env.Append(LINKFAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
else: else:
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32']) env.Append(CCFLAGS=['-m32'])
if GetOption('_64bit'):
env.Append(CPPDEFINES=["_64BIT"])
if(GetOption('beta')): if(GetOption('beta')):
env.Append(CPPDEFINES='BETA') env.Append(CPPDEFINES='BETA')

8
src/Config.h
View File

@ -45,15 +45,19 @@
#endif #endif
#if defined(WIN) #if defined(WIN)
#if defined(_64BIT)
#define IDENT_PLATFORM "WIN64"
#else
#define IDENT_PLATFORM "WIN32" #define IDENT_PLATFORM "WIN32"
#elif defined(MACOSX) #endif
#define IDENT_PLATFORM "MACOSX"
#elif defined(LIN) #elif defined(LIN)
#if defined(_64BIT) #if defined(_64BIT)
#define IDENT_PLATFORM "LIN64" #define IDENT_PLATFORM "LIN64"
#else #else
#define IDENT_PLATFORM "LIN32" #define IDENT_PLATFORM "LIN32"
#endif #endif
#elif defined(MACOSX)
#define IDENT_PLATFORM "MACOSX"
#else #else
#define IDENT_PLATFORM "UNKNOWN" #define IDENT_PLATFORM "UNKNOWN"
#endif #endif