diff options
| author | ntoskrnl <ntoskrnl11@yahoo.com> | 2012-07-29 17:33:01 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-08-02 14:21:31 (GMT) |
| commit | 4343faa10fd46744430e28126d33a7a3a0b3b6e1 (patch) | |
| tree | e48dcb5676bcb25332693acce05e78a781e3e8b1 | |
| parent | f94fabd999c304de958cc051e9625f169cec138f (diff) | |
| download | powder-4343faa10fd46744430e28126d33a7a3a0b3b6e1.zip powder-4343faa10fd46744430e28126d33a7a3a0b3b6e1.tar.gz | |
Some modifications for WIN64. SConscript not ready for that yet.
| -rw-r--r-- | SConscript | 4 | ||||
| -rw-r--r-- | src/Config.h | 8 |
2 files changed, 9 insertions, 3 deletions
@@ -119,13 +119,15 @@ if(GetOption('lin'): env.Append(LIBS=['X11', 'rt']) env.Append(CPPDEFINES=["LIN"]) if GetOption('_64bit'): - env.Append(CPPDEFINES=["_64BIT"]) env.Append(LINKFAGS=['-m64']) env.Append(CCFLAGS=['-m64']) else: env.Append(LINKFLAGS=['-m32']) env.Append(CCFLAGS=['-m32']) +if GetOption('_64bit'): + env.Append(CPPDEFINES=["_64BIT"]) + if(GetOption('beta')): env.Append(CPPDEFINES='BETA') diff --git a/src/Config.h b/src/Config.h index 8b05f45..730b2ff 100644 --- a/src/Config.h +++ b/src/Config.h @@ -45,15 +45,19 @@ #endif #if defined(WIN) +#if defined(_64BIT) +#define IDENT_PLATFORM "WIN64" +#else #define IDENT_PLATFORM "WIN32" -#elif defined(MACOSX) -#define IDENT_PLATFORM "MACOSX" +#endif #elif defined(LIN) #if defined(_64BIT) #define IDENT_PLATFORM "LIN64" #else #define IDENT_PLATFORM "LIN32" #endif +#elif defined(MACOSX) +#define IDENT_PLATFORM "MACOSX" #else #define IDENT_PLATFORM "UNKNOWN" #endif |