mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-07-31 21:50:18 +02:00
Code Issues Projects Releases Wiki Activity

minor SConscript cleanup

Browse Source
This commit is contained in:
jacob1
2018-05-28 11:55:54 -04:00
parent ce6c913c88
commit d4255d1974
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
SConscript
View File

@@ -244,10 +244,10 @@ def findLibs(env, conf):
#Look for SDL #Look for SDL
runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD" runSdlConfig = platform == "Linux" or compilePlatform == "Linux" or platform == "FreeBSD"
if False and platform == "Darwin" and conf.CheckFramework("SDL"): #if platform == "Darwin" and conf.CheckFramework("SDL"):
runSdlConfig = False # runSdlConfig = False
elif not conf.CheckLib("SDL2"): if not conf.CheckLib("SDL2"):
FatalError("SDL development library not found or not installed") FatalError("SDL2 development library not found or not installed")
if runSdlConfig: if runSdlConfig:
try: try:
@@ -260,11 +260,10 @@ def findLibs(env, conf):
pass pass
#look for SDL.h #look for SDL.h
if not conf.CheckCHeader('SDL2.h'): if conf.CheckCHeader('SDL2/SDL.h'):
if conf.CheckCHeader('SDL2/SDL.h'): env.Append(CPPDEFINES=["SDL_INC"])
env.Append(CPPDEFINES=["SDL_INC"]) elif not conf.CheckCHeader('SDL.h'):
else: FatalError("SDL.h not found")
FatalError("SDL.h not found")
if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'): if not GetOption('nolua') and not GetOption('renderer') and not GetOption('font'):
#Look for Lua #Look for Lua