From a21c9283647290f27deb8c02c793aeb14b1e9989 Mon Sep 17 00:00:00 2001
From: momo5502 <mauriceheumann@gmail.com>
Date: Tue, 30 Aug 2016 18:31:57 +0200
Subject: [PATCH] Temporarily

---
 deps/protobuf           |  2 +-
 premake/bitmrc.lua      |  2 ++
 premake/libcryptopp.lua | 22 ++++++++++++++++++----
 premake/sqlite3.lua     | 10 +++++-----
 4 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/deps/protobuf b/deps/protobuf
index e721ce66..8c936063 160000
--- a/deps/protobuf
+++ b/deps/protobuf
@@ -1 +1 @@
-Subproject commit e721ce66cfeaa5d8790ecba09c73d1ef399887d2
+Subproject commit 8c936063570e5ede2ac41cf49aefe1075f1c7251
diff --git a/premake/bitmrc.lua b/premake/bitmrc.lua
index 2bd48484..77db6a4e 100644
--- a/premake/bitmrc.lua
+++ b/premake/bitmrc.lua
@@ -49,6 +49,8 @@ function bitmrc.project()
 			path.join(bitmrc.settings.source, "BitMRC/main.*"),
 			path.join(bitmrc.settings.source, "BitMRC/class.*"),
 			path.join(bitmrc.settings.source, "BitMRC/tests/**"),
+			
+			path.join(bitmrc.settings.source, "BitMRC/Storage/Storable.cpp"),
 		}
 
 		-- dependencies
diff --git a/premake/libcryptopp.lua b/premake/libcryptopp.lua
index d0a05021..c2116497 100644
--- a/premake/libcryptopp.lua
+++ b/premake/libcryptopp.lua
@@ -21,6 +21,11 @@ end
 
 function libcryptopp.includes()
 	if not libcryptopp.settings then error("Run libcryptopp.setup first") end
+	
+	--defines { "CRYPTOPP_IMPORTS" }
+	
+	--filter "*Static"
+	--	removedefines { "CRYPTOPP_IMPORTS" }
 
 	filter "Debug*"
 		defines { "_DEBUG" }
@@ -102,6 +107,12 @@ function libcryptopp.project()
 			path.join(libcryptopp.settings.source, "fipsalgt.*"),
 			path.join(libcryptopp.settings.source, "cryptlib_bds.*"),
 			path.join(libcryptopp.settings.source, "validat*.*"),
+			
+			-- Remove linker warnings
+			path.join(libcryptopp.settings.source, "strciphr.cpp"),
+			path.join(libcryptopp.settings.source, "simple.cpp"),
+			path.join(libcryptopp.settings.source, "polynomi.cpp"),
+			path.join(libcryptopp.settings.source, "algebra.cpp"),
 		}
 
 		-- Pre-compiled header
@@ -117,13 +128,16 @@ function libcryptopp.project()
 			"MASM",
 			--"CustomProtoBuildTool",
 		}
-
-		kind "SharedLib"
-		filter "*Static"
+		
+		-- SharedLib needs that
+		--links { "Ws2_32" }
+		
+		--kind "SharedLib"
+		--filter "*Static"
 			kind "StaticLib"
 
 		filter "kind:SharedLib"
-			defines { "CRYPTOPP_IMPORTS" }
+			defines { "CRYPTOPP_EXPORTS" }
 
 		filter "architecture:x86"
 			exceptionhandling "SEH"
diff --git a/premake/sqlite3.lua b/premake/sqlite3.lua
index 730eea78..a3d12e4f 100644
--- a/premake/sqlite3.lua
+++ b/premake/sqlite3.lua
@@ -45,10 +45,10 @@ function sqlite3.project()
 		-- not our code, ignore POSIX usage warnings for now
 		warnings "Off"
 
-		kind "SharedLib"
-		filter "*Static"
+		--kind "SharedLib"
+		--filter "*Static"
 			kind "StaticLib"
-		filter "kind:StaticLib"
-			defines { "_LIB" }
-			removedefines { "_USRDLL", "_DLL" }
+		--filter "kind:StaticLib"
+		--	defines { "_LIB" }
+		--	removedefines { "_USRDLL", "_DLL" }
 end