summaryrefslogtreecommitdiff
path: root/SConscript
diff options
context:
space:
mode:
authorbuild.powdertoy.co.uk <admin@powdertoy.co.uk>2012-07-08 18:26:31 (GMT)
committer build.powdertoy.co.uk <admin@powdertoy.co.uk>2012-07-08 18:26:31 (GMT)
commit52c9a9052a63cf124c1fca7504c267a03553d8b0 (patch)
tree30fe823f0ef4a27d20eb8e26d9c9c72b51f446c0 /SConscript
parentf5c9da236f51cc89d8dcf0453f9f361ed45c4600 (diff)
downloadpowder-52c9a9052a63cf124c1fca7504c267a03553d8b0.zip
powder-52c9a9052a63cf124c1fca7504c267a03553d8b0.tar.gz
Update sconscript
Diffstat (limited to 'SConscript')
-rw-r--r--SConscript6
1 files changed, 4 insertions, 2 deletions
diff --git a/SConscript b/SConscript
index 27f52c9..5020761 100644
--- a/SConscript
+++ b/SConscript
@@ -51,7 +51,7 @@ except:
print "sdl headers not found or not installed"
raise SystemExit(1)
else:
- env.Append(CCFLAGS=['-I' + GetOption("sdl-dir")])
+ env.Append(CPPPATH=GetOption("sdl-dir"))
#Find correct lua include dir
if(GetOption("lua-dir")):
@@ -59,7 +59,7 @@ if(GetOption("lua-dir")):
print "lua5.1 headers not found or not installed"
raise SystemExit(1)
else:
- env.Append(CCFLAGS=['-I' + GetOption("lua-dir")])
+ env.Append(CPPPATH=GetOption("lua-dir"))
#Check for FFT lib
if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'):
@@ -88,9 +88,11 @@ if(GetOption('lin32') or GetOption('lin64')):
openGLLibs = ['GL']
env.Append(LIBS=['X11', 'rt'])
if GetOption('lin32'):
+ env.Append(LINKFLAGS=['-m32'])
env.Append(CCFLAGS=['-m32'])
env.Append(CPPDEFINES=["LIN32"])
else:
+ env.Append(LINKFAGS=['-m64'])
env.Append(CCFLAGS=['-m64'])
env.Append(CPPDEFINES=["LIN64"])