summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-07-15 10:04:15 (GMT)
committerRemko Tronçon <git@el-tramo.be>2012-07-15 10:18:32 (GMT)
commitfef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7 (patch)
tree855df2beab9bfdb9b1da9d87a3abf809f6959e80
parent69f2b252162b47ba174aab6b283b724d33fc38d7 (diff)
downloadswift-fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7.zip
swift-fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7.tar.bz2
Fixed compilation on Windows.
-rw-r--r--Swift/Controllers/SConscript1
-rw-r--r--Swiften/Network/MiniUPnPInterface.h1
-rw-r--r--Swiften/SConscript3
3 files changed, 4 insertions, 1 deletions
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 70085a6..1914a66 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -19,6 +19,7 @@ if env["SCONS_STAGE"] == "flags" :
if env["SCONS_STAGE"] == "build" :
myenv = env.Clone()
myenv.BuildVersion("BuildVersion.h", project = "swift")
+ myenv.MergeFlags(env["SWIFTEN_FLAGS"])
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.StaticLibrary("SwiftControllers", [
"Chat/ChatController.cpp",
diff --git a/Swiften/Network/MiniUPnPInterface.h b/Swiften/Network/MiniUPnPInterface.h
index 49a7cd2..61d12ca 100644
--- a/Swiften/Network/MiniUPnPInterface.h
+++ b/Swiften/Network/MiniUPnPInterface.h
@@ -8,6 +8,7 @@
#include <boost/optional.hpp>
#include <boost/noncopyable.hpp>
+#include <boost/shared_ptr.hpp>
#include <Swiften/Network/NATPortMapping.h>
#include <Swiften/Network/NATTraversalInterface.h>
diff --git a/Swiften/SConscript b/Swiften/SConscript
index c9796f4..9996728 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -37,7 +37,7 @@ if env["SCONS_STAGE"] == "flags" :
swiften_env["LIBPATH"] = [Dir(".")]
swiften_env["LIBS"] = [swiften_env["SWIFTEN_LIBRARY"]]
if not env["SWIFTEN_DLL"] :
- swiften_env["CPPDEFINES"] = ["SWIFTEN_STATIC"]
+ swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
dep_env = env.Clone()
for module in swiften_dep_modules :
if env.get(module + "_BUNDLED", False) :
@@ -75,6 +75,7 @@ if env["SCONS_STAGE"] == "build" :
swiften_env.AddMethod(lambda e,s : e.SharedObject(s), "SwiftenObject")
swiften_env.AddMethod(lambda e,l,o : e.SharedLibrary(l,o), "SwiftenLibrary")
else :
+ swiften_env.Append(CPPDEFINES = ["SWIFTEN_STATIC"])
swiften_env.AddMethod(lambda e,s : e.StaticObject(s), "SwiftenObject")
swiften_env.AddMethod(lambda e,l,o : e.StaticLibrary(l,o), "SwiftenLibrary")
Export("swiften_env")