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

Merge pull request #198 from mniip/scs

Browse Source 
fix compiling with --lua-dir on linux
This commit is contained in:
jacob1 2013-12-09 07:09:51 -08:00
commit 406e71e1ae
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
SConscript
View File

@ -186,14 +186,13 @@ if not GetOption("macosx"):
raise SystemExit(1)
else:
env.Append(CPPPATH=[GetOption("lua-dir")])
else:
try:
env.ParseConfig('pkg-config --cflags lua5.1')
except:
#Check for Lua lib
if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'):
print "liblua5.1 not found or not installed"
raise SystemExit(1)
try:
env.ParseConfig('pkg-config --cflags lua5.1')
except:
#Check for Lua lib
if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'):
print "liblua5.1 not found or not installed"
raise SystemExit(1)
# if fft is enabled try to parse its config, fail otherwise.