Merge branch 'master' into develop

This commit is contained in:
mniip
2013-12-18 23:22:39 +04:00

View File

@@ -188,6 +188,7 @@ if not GetOption("macosx"):
env.Append(CPPPATH=[GetOption("lua-dir")]) env.Append(CPPPATH=[GetOption("lua-dir")])
try: try:
env.ParseConfig('pkg-config --cflags lua5.1') env.ParseConfig('pkg-config --cflags lua5.1')
env.ParseConfig('pkg-config --libs lua5.1')
except: except:
#Check for Lua lib #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'): if not conf.CheckLib('lua5.1') and not conf.CheckLib('lua-5.1') and not conf.CheckLib('lua51') and not conf.CheckLib('lua'):