summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-02-23 21:12:18 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-02-24 18:14:46 (GMT)
commit442420335b9533b2a43c6e3f09758a94af045a84 (patch)
tree3fa350e115340f7db4dfbf1a4aa5845bf4a724c5 /BuildTools
parentf0142e0ea71a1f89b8c46ab6bde7e188c0bc79f4 (diff)
downloadswift-442420335b9533b2a43c6e3f09758a94af045a84.zip
swift-442420335b9533b2a43c6e3f09758a94af045a84.tar.bz2
Added initial version of Sluift.
Diffstat (limited to 'BuildTools')
-rw-r--r--BuildTools/SCons/SConstruct6
1 files changed, 6 insertions, 0 deletions
diff --git a/BuildTools/SCons/SConstruct b/BuildTools/SCons/SConstruct
index 69dbe19..2d9cc15 100644
--- a/BuildTools/SCons/SConstruct
+++ b/BuildTools/SCons/SConstruct
@@ -273,8 +273,11 @@ def colorize(command, target, color) :
if int(ARGUMENTS.get("V", 0)) == 0:
env["CCCOMSTR"] = colorize("CC", "$TARGET", "green")
+ env["SHCCCOMSTR"] = colorize("CC", "$TARGET", "green")
env["CXXCOMSTR"] = colorize("CXX", "$TARGET", "green")
+ env["SHCXXCOMSTR"] = colorize("CXX", "$TARGET", "green")
env["LINKCOMSTR"] = colorize("LINK", "$TARGET", "red")
+ env["SHLINKCOMSTR"] = colorize("LINK", "$TARGET", "red")
env["ARCOMSTR"] = colorize("AR", "$TARGET", "red")
env["RANLIBCOMSTR"] = colorize("RANLIB", "$TARGET", "red")
env["QT4_RCCCOMSTR"] = colorize("RCC", "$TARGET", "blue")
@@ -485,6 +488,9 @@ else :
env["LIBIDN_BUNDLED"] = 1
conf.Finish()
+# Lua
+env["LUA_BUNDLED"] = 1
+
# Avahi
avahi_conf_env = conf_env.Clone()
avahi_flags = {}