Skip to content

Commit

Permalink
look for normal SDL library before SDL framework on OS X
Browse files Browse the repository at this point in the history
before it refused to even look for the library, it only checked for the framework
  • Loading branch information
jacob1 committed Jan 24, 2016
1 parent 3cf5395 commit a6f49ad
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions SConscript
Expand Up @@ -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'):
Expand Down

0 comments on commit a6f49ad

Please sign in to comment.