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

Small fixes to Sconscript

Browse Source
This commit is contained in:
Simon Robertshaw
2013-01-22 20:08:36 +00:00
parent 9fb3e75f93
commit f1e51ba9bc
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SConscript
View File

@@ -78,13 +78,16 @@ if not GetOption("macosx"):
env.ParseConfig('sdl-config --cflags') env.ParseConfig('sdl-config --cflags')
env.ParseConfig('sdl-config --libs') env.ParseConfig('sdl-config --libs')
except: except:
conf.CheckLib("SDL") if not conf.CheckLib("SDL"):
print "libSDL not found or not installed"
raise SystemExit(1)
if(GetOption("sdl-dir")): if(GetOption("sdl-dir")):
if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'): if not conf.CheckCHeader(GetOption("sdl-dir") + '/SDL.h'):
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(CPPPATH=GetOption("sdl-dir")) env.Append(CPPPATH=[GetOption("sdl-dir")])
#Find correct lua include dir #Find correct lua include dir
try: try:
@@ -95,7 +98,7 @@ if not GetOption("macosx"):
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(CPPPATH=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'):
@@ -258,9 +261,12 @@ sources+=Glob("src/*/*.cpp")
sources+=Glob("src/simulation/elements/*.cpp") sources+=Glob("src/simulation/elements/*.cpp")
sources+=Glob("src/simulation/tools/*.cpp") sources+=Glob("src/simulation/tools/*.cpp")
#for source in sources:
# print str(source)
if(GetOption('win')): if(GetOption('win')):
sources = filter(lambda source: str(source) != 'src\\simulation\\Gravity.cpp', sources) sources = filter(lambda source: not 'src\\simulation\\Gravity.cpp' in str(source), sources)
sources = filter(lambda source: str(source) != 'src/simulation/Gravity.cpp', sources) sources = filter(lambda source: not 'src/simulation/Gravity.cpp' in str(source), sources)
SetupSpawn(env) SetupSpawn(env)