From dfbfb459d16ceaf94b4b4f5e187403f3aaee6ded Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sun, 24 Jan 2016 21:44:24 +0000 Subject: [PATCH] Fix mac sdl compile (apparently it actually did need to run sdl-config) --- SConscript | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/SConscript b/SConscript index 90fc19d22b..a4b251dbed 100644 --- a/SConscript +++ b/SConscript @@ -127,6 +127,10 @@ if tool: env['STRIP'] = tool+'strip' if os.path.isdir("/usr/{0}/bin".format(tool[:-1])): 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 for var in ["CC","CXX","LD","LIBPATH"]: @@ -239,10 +243,13 @@ def findLibs(env, conf): FatalError("SDL framework not found or not installed") else: 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: 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: pass