Swift
summaryrefslogtreecommitdiffstats
path: root/Slimber
diff options
context:
space:
mode:
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.cpp30
-rw-r--r--Slimber/Server.h18
5 files changed, 27 insertions, 24 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 d664846..1283dc7 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 dc7fefa..2298b0a 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.MergeFlags(env["SWIFTEN_DEP_FLAGS"])
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index fb9318e..f4aabd4 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -8,22 +8,22 @@
#include <string>
#include <boost/bind.hpp>
-#include <iostream>
+#include "Swiften/Base/String.h"
+#include "Swiften/LinkLocal/LinkLocalConnector.h"
+#include "Swiften/Network/Connection.h"
+#include "Swiften/Session/SessionTracer.h"
+#include "Swiften/Elements/Element.h"
+#include "Swiften/Elements/Presence.h"
+#include "Swiften/Elements/RosterPayload.h"
+#include "Swiften/Network/BoostConnection.h"
+#include "Swiften/Network/BoostConnectionServer.h"
+#include "Swiften/Session/SessionTracer.h"
+#include "Swiften/Elements/IQ.h"
+#include "Swiften/Elements/VCard.h"
+#include "Limber/Server/UserRegistry.h"
+#include "Swiften/Session/Session.h"
#include <Swiften/Base/foreach.h>
-#include <Swiften/Base/String.h>
-#include <Swiften/LinkLocal/LinkLocalConnector.h>
-#include <Swiften/Network/Connection.h>
-#include <Swiften/Session/SessionTracer.h>
-#include <Swiften/Elements/Element.h>
-#include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/RosterPayload.h>
-#include <Swiften/Network/BoostConnection.h>
-#include <Swiften/Network/BoostConnectionServer.h>
-#include <Swiften/Session/SessionTracer.h>
-#include <Swiften/Elements/IQ.h>
-#include <Swiften/Elements/VCard.h>
-#include <Swiften/Server/UserRegistry.h>
#include <string>
#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
#include <Swiften/LinkLocal/OutgoingLinkLocalSession.h>
@@ -32,7 +32,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 386365b..58b1e7c 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -10,15 +10,15 @@
#include <boost/optional.hpp>
#include <vector>
-#include <Swiften/Network/BoostIOServiceThread.h>
-#include <Swiften/Network/BoostConnectionServer.h>
-#include <Swiften/Server/UserRegistry.h>
-#include <Swiften/Base/IDGenerator.h>
-#include <Swiften/Server/ServerFromClientSession.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
-#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
-#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
+#include "Swiften/Network/BoostIOServiceThread.h"
+#include "Swiften/Network/BoostConnectionServer.h"
+#include "Limber/Server/UserRegistry.h"
+#include "Swiften/Base/IDGenerator.h"
+#include "Limber/Server/ServerFromClientSession.h"
+#include "Swiften/JID/JID.h"
+#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
+#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
+#include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
#include "Slimber/ServerError.h"
namespace Swift {