3 files changed, 107 insertions, 100 deletions
diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp
index 8dd8fcc..c03e633 100644
--- a/Sluift/Lua/Value.cpp
+++ b/Sluift/Lua/Value.cpp
@@ -1,65 +1,65 @@
-/*
- * Copyright (c) 2011 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#include "Value.h"
-
-extern "C" {
-	#include <lualib.h>
-}
-#include <boost/variant/apply_visitor.hpp>
-#include <Swiften/Base/foreach.h>
-
-using namespace Swift;
-using namespace Swift::Lua;
-
-namespace {
-	struct PushVisitor : public boost::static_visitor<> {
-		PushVisitor(lua_State* state) : state(state) {
-		}
-
-		void operator()(const Nil&) const {
-			lua_pushnil(state);
-		}
-
-		void operator()(const bool& b) const {
-			lua_pushboolean(state, b);
-		}
-
-		void operator()(const int& i) const {
-			lua_pushnumber(state, i);
-		}
-
-		void operator()(const std::string& s) const {
-			lua_pushstring(state, s.c_str());
-		}
-
-		void operator()(const std::vector<Value>& values) const {
-			lua_createtable(state, values.size(), 0);
-			for(size_t i = 0; i < values.size(); ++i) {
-				boost::apply_visitor(PushVisitor(state), values[i]);
-				lua_rawseti(state, -2, i + 1);
-			}
-		}
-
-		void operator()(const std::map<std::string, boost::shared_ptr<Value> >& table) const {
-			lua_createtable(state, 0, table.size());
-			for(std::map<std::string, boost::shared_ptr<Value> >::const_iterator i = table.begin(); i != table.end(); ++i) {
-				boost::apply_visitor(PushVisitor(state), *i->second);
-				lua_setfield(state, -2, i->first.c_str());
-			}
-		}
-
-		lua_State* state;
-	};
-}
-
-namespace Swift { namespace Lua {
-
-void pushValue(lua_State* state, const Value& value) {
-	boost::apply_visitor(PushVisitor(state), value);
-}
-
-}}
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#include "Value.h"
+
+extern "C" {
+	#include <lualib.h>
+}
+#include <boost/variant/apply_visitor.hpp>
+#include <Swiften/Base/foreach.h>
+
+using namespace Swift;
+using namespace Swift::Lua;
+
+namespace {
+	struct PushVisitor : public boost::static_visitor<> {
+		PushVisitor(lua_State* state) : state(state) {
+		}
+
+		void operator()(const Nil&) const {
+			lua_pushnil(state);
+		}
+
+		void operator()(const bool& b) const {
+			lua_pushboolean(state, b);
+		}
+
+		void operator()(const int& i) const {
+			lua_pushnumber(state, i);
+		}
+
+		void operator()(const std::string& s) const {
+			lua_pushstring(state, s.c_str());
+		}
+
+		void operator()(const std::vector<Value>& values) const {
+			lua_createtable(state, values.size(), 0);
+			for(size_t i = 0; i < values.size(); ++i) {
+				boost::apply_visitor(PushVisitor(state), values[i]);
+				lua_rawseti(state, -2, i + 1);
+			}
+		}
+
+		void operator()(const std::map<std::string, boost::shared_ptr<Value> >& table) const {
+			lua_createtable(state, 0, table.size());
+			for(std::map<std::string, boost::shared_ptr<Value> >::const_iterator i = table.begin(); i != table.end(); ++i) {
+				boost::apply_visitor(PushVisitor(state), *i->second);
+				lua_setfield(state, -2, i->first.c_str());
+			}
+		}
+
+		lua_State* state;
+	};
+}
+
+namespace Swift { namespace Lua {
+
+void pushValue(lua_State* state, const Value& value) {
+	boost::apply_visitor(PushVisitor(state), value);
+}
+
+}}
diff --git a/Sluift/Lua/Value.h b/Sluift/Lua/Value.h
index 9b6da34..7b10cd2 100644
--- a/Sluift/Lua/Value.h
+++ b/Sluift/Lua/Value.h
@@ -1,34 +1,34 @@
-/*
- * Copyright (c) 2011 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
- */
-
-#pragma once
-
-#include <map>
-#include <string>
-#include <vector>
-#include <boost/variant.hpp>
-#include <boost/shared_ptr.hpp>
-
-struct lua_State;
-
-namespace Swift {
-	namespace Lua {
-		struct Nil {};
-
-		typedef boost::make_recursive_variant<
-				Nil,
-				bool,
-				int, 
-				std::string,
-				std::vector< boost::recursive_variant_ >,
-				std::map<std::string, boost::shared_ptr<boost::recursive_variant_> >
-			>::type Value;
-
-		typedef std::map<std::string, boost::shared_ptr<Value> > Table;
-		
-		void pushValue(lua_State* state, const Value& value);
-	}
-}
+/*
+ * Copyright (c) 2011 Remko Tronçon
+ * Licensed under the GNU General Public License v3.
+ * See Documentation/Licenses/GPLv3.txt for more information.
+ */
+
+#pragma once
+
+#include <map>
+#include <string>
+#include <vector>
+#include <boost/variant.hpp>
+#include <boost/shared_ptr.hpp>
+
+struct lua_State;
+
+namespace Swift {
+	namespace Lua {
+		struct Nil {};
+
+		typedef boost::make_recursive_variant<
+				Nil,
+				bool,
+				int, 
+				std::string,
+				std::vector< boost::recursive_variant_ >,
+				std::map<std::string, boost::shared_ptr<boost::recursive_variant_> >
+			>::type Value;
+
+		typedef std::map<std::string, boost::shared_ptr<Value> > Table;
+		
+		void pushValue(lua_State* state, const Value& value);
+	}
+}
diff --git a/Sluift/SConscript b/Sluift/SConscript
index 19dc1e7..777cf0c 100644
--- a/Sluift/SConscript
+++ b/Sluift/SConscript
@@ -1,4 +1,4 @@
-import Version
+import Version, os.path
 
 Import(["env", "conf_env"])
 
@@ -49,3 +49,10 @@ if env["SCONS_STAGE"] == "build" :
 
 	myenv.WriteVal("dll.c", myenv.Value(""))
 	myenv.SharedLibrary("sluift", ["dll.c"])
+
+	if env["PLATFORM"] == "win32" :
+		myenv.WindowsBundle("Sluift", 
+			resources = {"": [
+				os.path.join(env["OPENSSL_DIR"], "bin", "ssleay32.dll"),  
+				os.path.join(env["OPENSSL_DIR"], "bin", "libeay32.dll")
+			]})