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

Fix mac sdl compile (apparently it actually did need to run sdl-config)

Browse Source
This commit is contained in:
jacob1 2016-01-24 21:44:24 +00:00
parent 82257e5e39
commit dfbfb459d1
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
SConscript
View File

@ -127,6 +127,10 @@ if tool:
env['STRIP'] = tool+'strip' env['STRIP'] = tool+'strip'
if os.path.isdir("/usr/{0}/bin".format(tool[:-1])): if os.path.isdir("/usr/{0}/bin".format(tool[:-1])):
env['ENV']['PATH'] = "/usr/{0}/bin:{1}".format(tool[:-1], os.environ['PATH']) env['ENV']['PATH'] = "/usr/{0}/bin:{1}".format(tool[:-1], os.environ['PATH'])
if platform == "Darwin":
sdlconfigpath = "/usr/lib/apple/SDKs/MacOSX10.5.sdk/usr/bin"
if os.path.isdir(sdlconfigpath):
env['ENV']['PATH'] = "{0}:{1}".format(sdlconfigpath, env['ENV']['PATH'])
#copy environment variables because scons doesn't do this by default #copy environment variables because scons doesn't do this by default
for var in ["CC","CXX","LD","LIBPATH"]: for var in ["CC","CXX","LD","LIBPATH"]:
@ -239,10 +243,13 @@ def findLibs(env, conf):
FatalError("SDL framework not found or not installed") FatalError("SDL framework not found or not installed")
else: else:
FatalError("SDL development library not found or not installed") FatalError("SDL development library not found or not installed")
if platform == "Linux" or (compilePlatform == "Linux" and platform != "Darwin"): if platform == "Linux" or compilePlatform == "Linux":
try: try:
env.ParseConfig('sdl-config --cflags') env.ParseConfig('sdl-config --cflags')
env.ParseConfig('sdl-config --libs') if GetOption('static'):
env.ParseConfig('sdl-config --static-libs')
else:
env.ParseConfig('sdl-config --libs')
except: except:
pass pass