mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-09-02 20:42:36 +02:00
Code Issues Projects Releases Wiki Activity

No lib detection for OS X

Browse Source
This commit is contained in:
Simon Robertshaw
2012-09-25 18:03:58 +01:00
parent 9ba08768a4
commit 2833c0d20c
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
SConscript
View File

@@ -66,9 +66,9 @@ if GetOption("toolprefix"):
env['RC'] = GetOption("toolprefix")+env['RC'] env['RC'] = GetOption("toolprefix")+env['RC']
#Check for headers and libraries #Check for headers and libraries
if not GetOption("macosx"):
conf = Configure(env) conf = Configure(env)
if not GetOption("macosx"):
try: try:
env.ParseConfig('sdl-config --cflags') env.ParseConfig('sdl-config --cflags')
env.ParseConfig('sdl-config --libs') env.ParseConfig('sdl-config --libs')
@@ -82,7 +82,6 @@ if not GetOption("macosx"):
env.Append(CPPPATH=GetOption("sdl-dir")) env.Append(CPPPATH=GetOption("sdl-dir"))
#Find correct lua include dir #Find correct lua include dir
if not GetOption("macosx"):
try: try:
env.ParseConfig('pkg-config --cflags lua5.1') env.ParseConfig('pkg-config --cflags lua5.1')
except: except:
@@ -94,7 +93,6 @@ if not GetOption("macosx"):
env.Append(CPPPATH=GetOption("lua-dir")) env.Append(CPPPATH=GetOption("lua-dir"))
#Check for FFT lib #Check for FFT lib
if not GetOption("macosx"):
if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'): if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'):
print "libfftw3f not found or not installed" print "libfftw3f not found or not installed"
raise SystemExit(1) raise SystemExit(1)
@@ -120,6 +118,8 @@ if not GetOption("macosx"):
raise SystemExit(1) raise SystemExit(1)
env = conf.Finish(); env = conf.Finish();
else:
env.Append(LIBS=['z', 'bz2', 'fftw3f'])
env.Append(CPPPATH=['src/', 'data/', 'generated/']) env.Append(CPPPATH=['src/', 'data/', 'generated/'])
env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions']) env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions'])