summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-06-04 17:15:34 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-06-05 07:32:01 (GMT)
commite43999d275ff27970ba973edd2be68fb6b998aaf (patch)
treeb3442e40a221b19f60535028e04712396dabe7ed /Slimber
parent1514e787b28ee09ea28d75828bf41049696fd5c7 (diff)
downloadswift-e43999d275ff27970ba973edd2be68fb6b998aaf.zip
swift-e43999d275ff27970ba973edd2be68fb6b998aaf.tar.bz2
Added ICU support.
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/CLI/SConscript7
-rw-r--r--Slimber/Cocoa/SConscript8
2 files changed, 2 insertions, 13 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index 04e4976..e17996d 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -5,12 +5,7 @@ myenv.UseFlags(env["SLIMBER_FLAGS"])
myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.UseFlags(env["SWIFTOOLS_FLAGS"])
myenv.UseFlags(env["SWIFTEN_FLAGS"])
-myenv.UseFlags(env["LIBIDN_FLAGS"])
-myenv.UseFlags(env["BOOST_FLAGS"])
-myenv.UseFlags(env.get("LIBXML_FLAGS", {}))
-myenv.UseFlags(env.get("EXPAT_FLAGS", {}))
-myenv.UseFlags(env.get("AVAHI_FLAGS", {}))
-myenv.UseFlags(myenv["PLATFORM_FLAGS"])
+myenv.UseFlags(env["SWIFTEN_DEP_FLAGS"])
myenv.Program("slimber", [
"main.cpp",
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index 1283dc7..441dc27 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -5,13 +5,7 @@ myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
-myenv.MergeFlags(env["LIBIDN_FLAGS"])
-myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
-myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
-myenv.Append(CXXFLAGS = myenv["OBJCCFLAGS"])
-myenv.Append(FRAMEWORKS = "Cocoa")
-myenv.MergeFlags(myenv["PLATFORM_FLAGS"])
+myenv.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
myenv.Program("Slimber", [
"main.mm",