summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-06-18 10:21:21 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-06-18 10:21:21 (GMT)
commit7af8a078c57d94ff63eb81f26de2f55eca6b5c00 (patch)
tree6da747b7909de1069ad38f7706eae27afc7b3e70 /Slimber
parent774c195afa103a577421541b821be05defa26a84 (diff)
downloadswift-7af8a078c57d94ff63eb81f26de2f55eca6b5c00.zip
swift-7af8a078c57d94ff63eb81f26de2f55eca6b5c00.tar.bz2
Moving unused server code out of Swiften into Limber.
Diffstat (limited to 'Slimber')
-rw-r--r--Slimber/CLI/SConscript1
-rw-r--r--Slimber/Cocoa/SConscript1
-rw-r--r--Slimber/SConscript1
-rw-r--r--Slimber/Server.cpp4
-rw-r--r--Slimber/Server.h4
5 files changed, 7 insertions, 4 deletions
diff --git a/Slimber/CLI/SConscript b/Slimber/CLI/SConscript
index fddd717..422b56c 100644
--- a/Slimber/CLI/SConscript
+++ b/Slimber/CLI/SConscript
@@ -1,6 +1,7 @@
Import("env")
myenv = env.Clone()
+myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
diff --git a/Slimber/Cocoa/SConscript b/Slimber/Cocoa/SConscript
index e2d8221..e122d87 100644
--- a/Slimber/Cocoa/SConscript
+++ b/Slimber/Cocoa/SConscript
@@ -1,6 +1,7 @@
Import("env")
myenv = env.Clone()
+myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["SLIMBER_FLAGS"])
myenv.MergeFlags(env["SWIFTOOLS_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
diff --git a/Slimber/SConscript b/Slimber/SConscript
index 9a84c17..11beee6 100644
--- a/Slimber/SConscript
+++ b/Slimber/SConscript
@@ -31,6 +31,7 @@ if "Slimber" in env["PROJECTS"] :
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
+ myenv.UseFlags(env["LIMBER_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.StaticLibrary("Slimber", [
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index 380ce6a..d1d0e24 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -21,7 +21,7 @@
#include "Swiften/Session/SessionTracer.h"
#include "Swiften/Elements/IQ.h"
#include "Swiften/Elements/VCard.h"
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
#include <string>
#include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
#include "Swiften/LinkLocal/OutgoingLinkLocalSession.h"
@@ -30,7 +30,7 @@
#include "Swiften/Network/ConnectionServer.h"
#include "Slimber/VCardCollection.h"
#include "Slimber/LinkLocalPresenceManager.h"
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/ServerFromClientSession.h"
namespace Swift {
diff --git a/Slimber/Server.h b/Slimber/Server.h
index 98332fd..d1a2332 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -12,9 +12,9 @@
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/BoostConnectionServer.h"
-#include "Swiften/Server/UserRegistry.h"
+#include "Limber/Server/UserRegistry.h"
#include "Swiften/Base/IDGenerator.h"
-#include "Swiften/Server/ServerFromClientSession.h"
+#include "Limber/Server/ServerFromClientSession.h"
#include "Swiften/JID/JID.h"
#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"