summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-09 16:32:50 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-09 22:33:20 (GMT)
commitdc951ebf7e4ab6fce39f16687be1e93f8140b71f (patch)
tree4eee56d72b8773049522fbaff8d9fb1ee0a5c978 /Slimber
parent64ab77e910579bce3fe99b107a82753a7f32d77c (diff)
downloadswift-contrib-dc951ebf7e4ab6fce39f16687be1e93f8140b71f.zip
swift-contrib-dc951ebf7e4ab6fce39f16687be1e93f8140b71f.tar.bz2
Moved Application from Swiften into SwifTools.
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/CLI/SConscript1
-rw-r--r--Slimber/Cocoa/SConscript1
-rw-r--r--Slimber/MainController.cpp2
-rw-r--r--Slimber/Qt/SConscript1
4 files changed, 4 insertions, 1 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index b939326..50aafc5 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -2,6 +2,7 @@ Import("env")
myenv = env.Clone()
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"])
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index 6594b9f..f11b276 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -2,6 +2,7 @@ Import("env")
myenv = env.Clone()
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"])
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp
index a557a07..38c1a7c 100644
--- a/Slimber/MainController.cpp
+++ b/Slimber/MainController.cpp
@@ -11,7 +11,7 @@
#include <iostream>
#include "Swiften/Base/foreach.h"
-#include "Swiften/Application/PlatformApplicationPathProvider.h"
+#include "SwifTools/Application/PlatformApplicationPathProvider.h"
#include "Swiften/LinkLocal/LinkLocalService.h"
#include "Swiften/LinkLocal/LinkLocalServiceBrowser.h"
#include "Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h"
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index 2148f02..53d8138 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -5,6 +5,7 @@ Import("env")
myenv = env.Clone()
myenv["CXXFLAGS"] = filter(lambda x : x != "-Wfloat-equal", myenv["CXXFLAGS"])
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"])