mirror of
https://github.com/The-Powder-Toy/The-Powder-Toy.git
synced 2025-08-31 19:51:45 +02:00
No lib detection for OS X
This commit is contained in:
@@ -66,9 +66,9 @@ if GetOption("toolprefix"):
|
||||
env['RC'] = GetOption("toolprefix")+env['RC']
|
||||
|
||||
#Check for headers and libraries
|
||||
if not GetOption("macosx"):
|
||||
conf = Configure(env)
|
||||
|
||||
if not GetOption("macosx"):
|
||||
try:
|
||||
env.ParseConfig('sdl-config --cflags')
|
||||
env.ParseConfig('sdl-config --libs')
|
||||
@@ -82,7 +82,6 @@ if not GetOption("macosx"):
|
||||
env.Append(CPPPATH=GetOption("sdl-dir"))
|
||||
|
||||
#Find correct lua include dir
|
||||
if not GetOption("macosx"):
|
||||
try:
|
||||
env.ParseConfig('pkg-config --cflags lua5.1')
|
||||
except:
|
||||
@@ -94,7 +93,6 @@ if not GetOption("macosx"):
|
||||
env.Append(CPPPATH=GetOption("lua-dir"))
|
||||
|
||||
#Check for FFT lib
|
||||
if not GetOption("macosx"):
|
||||
if not conf.CheckLib('fftw3f') and not conf.CheckLib('fftw3f-3'):
|
||||
print "libfftw3f not found or not installed"
|
||||
raise SystemExit(1)
|
||||
@@ -120,6 +118,8 @@ if not GetOption("macosx"):
|
||||
raise SystemExit(1)
|
||||
|
||||
env = conf.Finish();
|
||||
else:
|
||||
env.Append(LIBS=['z', 'bz2', 'fftw3f'])
|
||||
|
||||
env.Append(CPPPATH=['src/', 'data/', 'generated/'])
|
||||
env.Append(CCFLAGS=['-w', '-std=c99', '-fkeep-inline-functions'])
|
||||
|
Reference in New Issue
Block a user