From a6f49adae2e4eab7b16e419610eddcfdb6886f7b Mon Sep 17 00:00:00 2001 From: jacob1 Date: Sun, 24 Jan 2016 15:42:37 -0500 Subject: [PATCH] look for normal SDL library before SDL framework on OS X before it refused to even look for the library, it only checked for the framework --- SConscript | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SConscript b/SConscript index fa8d1d6fcf..305a9018c0 100644 --- a/SConscript +++ b/SConscript @@ -231,20 +231,20 @@ def findLibs(env, conf): if not conf.CheckLib('SDLmain'): FatalError("libSDLmain not found or not installed") - if platform == "Darwin": - if not conf.CheckFramework("SDL"): - FatalError("SDL framework not found or not installed") - elif not GetOption('renderer'): - if platform != "Darwin": - #Look for SDL - if not conf.CheckLib("SDL"): + if not GetOption('renderer'): + #Look for SDL + if not conf.CheckLib("SDL"): + if platform == "Darwin": + if not conf.CheckFramework("SDL"): + FatalError("SDL framework not found or not installed") + else: FatalError("SDL development library not found or not installed") - if platform == "Linux" or compilePlatform == "Linux": - try: - env.ParseConfig('sdl-config --cflags') - env.ParseConfig('sdl-config --libs') - except: - pass + if platform == "Linux" or compilePlatform == "Linux": + try: + env.ParseConfig('sdl-config --cflags') + env.ParseConfig('sdl-config --libs') + except: + pass #look for SDL.h if not GetOption('renderer') and not conf.CheckCHeader('SDL.h'):