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

look for normal SDL library before SDL framework on OS X

Browse Source 
before it refused to even look for the library, it only checked for the framework
This commit is contained in:
jacob1 2016-01-24 15:42:37 -05:00
parent 3cf5395697
commit a6f49adae2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
SConscript
View File

@ -231,20 +231,20 @@ def findLibs(env, conf):
if not conf.CheckLib('SDLmain'): if not conf.CheckLib('SDLmain'):
FatalError("libSDLmain not found or not installed") FatalError("libSDLmain not found or not installed")
if platform == "Darwin": if not GetOption('renderer'):
if not conf.CheckFramework("SDL"): #Look for SDL
FatalError("SDL framework not found or not installed") if not conf.CheckLib("SDL"):
elif not GetOption('renderer'): if platform == "Darwin":
if platform != "Darwin": if not conf.CheckFramework("SDL"):
#Look for SDL FatalError("SDL framework not found or not installed")
if not conf.CheckLib("SDL"): 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": if platform == "Linux" or compilePlatform == "Linux":
try: try:
env.ParseConfig('sdl-config --cflags') env.ParseConfig('sdl-config --cflags')
env.ParseConfig('sdl-config --libs') env.ParseConfig('sdl-config --libs')
except: except:
pass pass
#look for SDL.h #look for SDL.h
if not GetOption('renderer') and not conf.CheckCHeader('SDL.h'): if not GetOption('renderer') and not conf.CheckCHeader('SDL.h'):