summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-08-16 18:54:15 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-08-16 22:13:30 (GMT)
commit3f489e625589d6523b082e534f9ab71f1d9c3cbd (patch)
tree2c6f5382a7186cdce500642c9faeccf859b903a4 /Slimber
parent9ed3516fc091010637b7eba3678a1566507c59eb (diff)
downloadswift-contrib-3f489e625589d6523b082e534f9ab71f1d9c3cbd.zip
swift-contrib-3f489e625589d6523b082e534f9ab71f1d9c3cbd.tar.bz2
Add LibXML support to build system.
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/Cocoa/SConscript2
-rw-r--r--Slimber/Qt/SConscript3
2 files changed, 4 insertions, 1 deletions
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index 25d7579..a354bc8 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -5,6 +5,8 @@ myenv.MergeFlags(env["SLIMBER_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(FRAMEWORKS = "Cocoa")
myenv.Program("Slimber", [
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index de2e910..b2b8320 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -9,7 +9,8 @@ myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["CPPUNIT_FLAGS"])
myenv.MergeFlags(env["LIBIDN_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
-myenv.MergeFlags(env["EXPAT_FLAGS"])
+myenv.MergeFlags(env.get("LIBXML_FLAGS", ""))
+myenv.MergeFlags(env.get("EXPAT_FLAGS", ""))
myenv.Tool("qt4", toolpath = ["#/BuildTools/SCons/Tools"])
myenv.Tool("nsis", toolpath = ["#/BuildTools/SCons/Tools"])