From fef3ab6d96ae57ee1e5106bd3cbc45bde26a13e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Sun, 15 Jul 2012 12:04:15 +0200
Subject: Fixed compilation on Windows.


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")
-- 
cgit v0.10.2-6-g49f6