mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-06 16:36:32 +02:00
Code Issues Projects Releases Wiki Activity

remove _32BIT also

Browse Source
This commit is contained in:
jacob1
2014-07-06 11:41:11 -04:00
parent 8f2a0d3eb3
commit f0fb88b48d
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
SConscript
View File

@@ -138,7 +138,6 @@ for var in ["CFLAGS","CCFLAGS","CXXFLAGS","LINKFLAGS","CPPDEFINES","CPPPATH"]:
#Used for intro text / executable name, actual bit flags are only set if the --64bit/--32bit command line args are given #Used for intro text / executable name, actual bit flags are only set if the --64bit/--32bit command line args are given
def add32bitflags(env): def add32bitflags(env):
env.Append(CPPDEFINES='_32BIT')
env["BIT"] = 32 env["BIT"] = 32
def add64bitflags(env): def add64bitflags(env):
if platform == "Windows": if platform == "Windows":

8
src/Config.h
View File

@@ -43,18 +43,14 @@
#if defined(WIN) #if defined(WIN)
#if defined(_64BIT) #if defined(_64BIT)
#define IDENT_PLATFORM "WIN64" #define IDENT_PLATFORM "WIN64"
#elif defined(_32BIT)
#define IDENT_PLATFORM "WIN32"
#else #else
#define IDENT_PLATFORM "WIN" #define IDENT_PLATFORM "WIN32"
#endif #endif
#elif defined(LIN) #elif defined(LIN)
#if defined(_64BIT) #if defined(_64BIT)
#define IDENT_PLATFORM "LIN64" #define IDENT_PLATFORM "LIN64"
#elif defined(_32BIT)
#define IDENT_PLATFORM "LIN32"
#else #else
#define IDENT_PLATFORM "LIN" #define IDENT_PLATFORM "LIN32"
#endif #endif
#elif defined(MACOSX) #elif defined(MACOSX)
#define IDENT_PLATFORM "MACOSX" #define IDENT_PLATFORM "MACOSX"