Skip to content

Commit

Permalink
minor SConscript cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
jacob1 committed May 28, 2018
1 parent ce6c913 commit d4255d1
Showing 1 changed file with 8 additions and 9 deletions.
17 changes: 8 additions & 9 deletions SConscript
Expand Up @@ -244,10 +244,10 @@ def findLibs(env, conf):

#Look for SDL
runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"
if False and platform == "Darwin" and conf.CheckFramework("SDL"):
runSdlConfig = False
elif not conf.CheckLib("SDL2"):
FatalError("SDL development library not found or not installed")
#if platform == "Darwin" and conf.CheckFramework("SDL"):
# runSdlConfig = False
if not conf.CheckLib("SDL2"):
FatalError("SDL2 development library not found or not installed")

if runSdlConfig:
try:
Expand All @@ -260,11 +260,10 @@ def findLibs(env, conf):
pass

#look for SDL.h
if not conf.CheckCHeader('SDL2.h'):
if conf.CheckCHeader('SDL2/SDL.h'):
env.Append(CPPDEFINES=["SDL_INC"])
else:
FatalError("SDL.h not found")
if conf.CheckCHeader('SDL2/SDL.h'):
env.Append(CPPDEFINES=["SDL_INC"])
elif not conf.CheckCHeader('SDL.h'):
FatalError("SDL.h not found")

if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
#Look for Lua
Expand Down

0 comments on commit d4255d1

Please sign in to comment.