mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-11 19:04:05 +02:00
Code Issues Projects Releases Wiki Activity

Add --32bit flag for scons.

Browse Source 
-m32 is no longer specified by default, fixes #214
This commit is contained in:
jacksonmj
2014-04-14 23:02:39 +01:00
parent 6b1b03a17e
commit ba850ade83
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
SConscript
View File

@@ -64,6 +64,7 @@ AddOption('--opengl',dest="opengl",action='store_true',default=False,help="Build
AddOption('--opengl-renderer',dest="opengl-renderer",action='store_true',default=False,help="Build with OpenGL renderer support. (requires --opengl)") AddOption('--opengl-renderer',dest="opengl-renderer",action='store_true',default=False,help="Build with OpenGL renderer support. (requires --opengl)")
AddOption('--renderer',dest="renderer",action='store_true',default=False,help="Save renderer") AddOption('--renderer',dest="renderer",action='store_true',default=False,help="Save renderer")
AddOption('--64bit',dest="_64bit",action='store_true',default=False,help="64-bit platform target") AddOption('--64bit',dest="_64bit",action='store_true',default=False,help="64-bit platform target")
AddOption('--32bit',dest="_32bit",action='store_true',default=False,help="32-bit platform target")
AddOption('--static',dest="static",action="store_true",default=False,help="Static linking, reduces external library dependancies but increased file size") AddOption('--static',dest="static",action="store_true",default=False,help="Static linking, reduces external library dependancies but increased file size")
AddOption('--pthreadw32-static',dest="ptw32-static",action="store_true",default=False,help="Use PTW32_STATIC_LIB for pthreadw32 headers") AddOption('--pthreadw32-static',dest="ptw32-static",action="store_true",default=False,help="Use PTW32_STATIC_LIB for pthreadw32 headers")
AddOption('--python-ver',dest="pythonver",default=False,help="Python version to use for generator.py") AddOption('--python-ver',dest="pythonver",default=False,help="Python version to use for generator.py")
@@ -336,7 +337,7 @@ if(GetOption('lin')):
if GetOption('_64bit'): if GetOption('_64bit'):
env.Append(LINKFLAGS=['-m64']) env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
else: elif GetOption('_32bit'):
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32']) env.Append(CCFLAGS=['-m32'])
@@ -363,7 +364,7 @@ if(GetOption('macosx')):
if GetOption('_64bit'): if GetOption('_64bit'):
env.Append(LINKFLAGS=['-m64']) env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
else: elif GetOption('_32bit'):
env.Append(LINKFLAGS=['-m32']) env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32']) env.Append(CCFLAGS=['-m32'])
@@ -374,6 +375,8 @@ if(GetOption('macosx')):
if GetOption('_64bit'): if GetOption('_64bit'):
env.Append(CPPDEFINES=["_64BIT"]) env.Append(CPPDEFINES=["_64BIT"])
if GetOption('_32bit'):
env.Append(CPPDEFINES=["_32BIT"])
if(GetOption('beta')): if(GetOption('beta')):
env.Append(CPPDEFINES='BETA') env.Append(CPPDEFINES='BETA')