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

Update sconscript

Browse Source
This commit is contained in:
build.powdertoy.co.uk 2012-07-08 19:26:31 +01:00
parent f5c9da236f
commit 52c9a9052a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SConscript
View File

@ -51,7 +51,7 @@ except:
print "sdl headers not found or not installed" print "sdl headers not found or not installed"
raise SystemExit(1) raise SystemExit(1)
else: else:
env.Append(CCFLAGS=['-I' + GetOption("sdl-dir")]) env.Append(CPPPATH=GetOption("sdl-dir"))
#Find correct lua include dir #Find correct lua include dir
if(GetOption("lua-dir")): if(GetOption("lua-dir")):
@ -59,7 +59,7 @@ if(GetOption("lua-dir")):
print "lua5.1 headers not found or not installed" print "lua5.1 headers not found or not installed"
raise SystemExit(1) raise SystemExit(1)
else: else:
env.Append(CCFLAGS=['-I' + GetOption("lua-dir")]) env.Append(CPPPATH=GetOption("lua-dir"))
#Check for FFT lib #Check for FFT lib
if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'): if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'):
@ -88,9 +88,11 @@ if(GetOption('lin32') or GetOption('lin64')):
openGLLibs = ['GL'] openGLLibs = ['GL']
env.Append(LIBS=['X11', 'rt']) env.Append(LIBS=['X11', 'rt'])
if GetOption('lin32'): if GetOption('lin32'):
env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32']) env.Append(CCFLAGS=['-m32'])
env.Append(CPPDEFINES=["LIN32"]) env.Append(CPPDEFINES=["LIN32"])
else: else:
env.Append(LINKFAGS=['-m64'])
env.Append(CCFLAGS=['-m64']) env.Append(CCFLAGS=['-m64'])
env.Append(CPPDEFINES=["LIN64"]) env.Append(CPPDEFINES=["LIN64"])