Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add --32bit flag for scons.
-m32 is no longer specified by default, fixes #214
  • Loading branch information
jacksonmj committed Apr 14, 2014
1 parent 6b1b03a commit ba850ad
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions SConscript
Expand Up @@ -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('--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('--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('--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")
Expand Down Expand Up @@ -336,7 +337,7 @@ if(GetOption('lin')):
if GetOption('_64bit'):
env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64'])
else:
elif GetOption('_32bit'):
env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32'])

Expand All @@ -363,7 +364,7 @@ if(GetOption('macosx')):
if GetOption('_64bit'):
env.Append(LINKFLAGS=['-m64'])
env.Append(CCFLAGS=['-m64'])
else:
elif GetOption('_32bit'):
env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32'])

Expand All @@ -374,6 +375,8 @@ if(GetOption('macosx')):

if GetOption('_64bit'):
env.Append(CPPDEFINES=["_64BIT"])
if GetOption('_32bit'):
env.Append(CPPDEFINES=["_32BIT"])

if(GetOption('beta')):
env.Append(CPPDEFINES='BETA')
Expand Down

0 comments on commit ba850ad

Please sign in to comment.