summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2013-09-14 08:17:09 (GMT)
committerRemko Tronçon <git@el-tramo.be>2013-09-15 12:23:48 (GMT)
commit211a59d837e0260456931f4b6a4d030afa07ea0c (patch)
treeeed70b106a684dd25bccd199785ee4475f07c54a /BuildTools/SCons/SConscript.boot
parentab2f797871abd688df5f393e3e75417facfb1bb0 (diff)
downloadswift-211a59d837e0260456931f4b6a4d030afa07ea0c.zip
swift-211a59d837e0260456931f4b6a4d030afa07ea0c.tar.bz2
Use system Lua if present
Change-Id: I665a603b1afa1e24e1b73618e976113a87be2001
Diffstat (limited to 'BuildTools/SCons/SConscript.boot')
-rw-r--r--BuildTools/SCons/SConscript.boot4
1 files changed, 4 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConscript.boot b/BuildTools/SCons/SConscript.boot
index 9c78bc0..b0e14ee 100644
--- a/BuildTools/SCons/SConscript.boot
+++ b/BuildTools/SCons/SConscript.boot
@@ -60,6 +60,10 @@ vars.Add(PathVariable("sqlite_includedir", "SQLite headers location", None, Path
vars.Add(PathVariable("sqlite_libdir", "SQLite library location", None, PathVariable.PathAccept))
vars.Add("sqlite_libname", "SQLite library name", "libsqlite3" if os.name == "nt" else "sqlite3")
vars.Add("sqlite_force_bundled", "Force use of the bundled SQLite", None)
+vars.Add(PathVariable("lua_includedir", "Lua headers location", None, PathVariable.PathAccept))
+vars.Add(PathVariable("lua_libdir", "Lua library location", None, PathVariable.PathAccept))
+vars.Add("lua_libname", "Lua library name", "liblua" if os.name == "nt" else "lua")
+vars.Add("lua_force_bundled", "Force use of the bundled Lua", None)
vars.Add(PathVariable("avahi_includedir", "Avahi headers location", None, PathVariable.PathAccept))
vars.Add(PathVariable("avahi_libdir", "Avahi library location", None, PathVariable.PathAccept))
vars.Add(PathVariable("qt", "Qt location", "", PathVariable.PathAccept))