Merge branch 'master' into develop

2013-12-18 23:22:39 +04:00 · 2013-12-18 23:22:39 +04:00 · f1cbff5d2e
commit f1cbff5d2e
parent c3cf0638d6 7e6a51cdfa
1 changed files with 1 additions and 0 deletions
--- a/1
+++ b/1
@ -188,6 +188,7 @@ if not GetOption("macosx"):
 				env.Append(CPPPATH=[GetOption("lua-dir")])
 		try:
 			env.ParseConfig('pkg-config --cflags lua5.1')
+			env.ParseConfig('pkg-config --libs 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'):