mirror/The-Powder-Toy
1
0
Fork 0
mirror of https://github.com/The-Powder-Toy/The-Powder-Toy.git synced 2025-08-09 09:56:35 +02:00
Code Issues Projects Releases Wiki Activity

fix crosscompiling, --lua-dir was being ignored

Browse Source
This commit is contained in:
jacob1
2013-10-25 12:05:30 -04:00
parent a6b5b60c20
commit 2ffe175c1b
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
SConscript
View File

@@ -176,19 +176,20 @@ if not GetOption("macosx"):
raise SystemExit(1) raise SystemExit(1)
# if lua is enabled try to parse the lua pgk-config, if that fails try the lua-dir option # if lua is enabled try to parse the lua pgk-config, or the lua-dir option if given
# .. : TODO: make this look the same as the SDL check, maybe make a function for it. keep it DRY.
if not GetOption("nolua"): if(GetOption("lua-dir")):
if not conf.CheckCHeader(GetOption("lua-dir") + '/lua.h'):
print "lua5.1 headers not found or not installed"
raise SystemExit(1)
else:
env.Append(CPPPATH=[GetOption("lua-dir")])
else:
try: try:
env.ParseConfig('pkg-config --cflags lua5.1') env.ParseConfig('pkg-config --cflags lua5.1')
except: except:
if(GetOption("lua-dir")): print "lua5.1 headers not found or not installed"
if not conf.CheckCHeader(GetOption("lua-dir") + '/lua.h'): raise SystemExit(1)
print "lua5.1 headers not found or not installed"
raise SystemExit(1)
else:
env.Append(CPPPATH=[GetOption("lua-dir")])
# if fft is enabled try to parse its config, fail otherwise. # if fft is enabled try to parse its config, fail otherwise.