diff --git a/AI/BattleAI/BattleAI.cbp b/AI/BattleAI/BattleAI.cbp
index 8510873b4..aa247ac04 100644
--- a/AI/BattleAI/BattleAI.cbp
+++ b/AI/BattleAI/BattleAI.cbp
@@ -50,7 +50,6 @@
 		<Unit filename="BattleAI.cpp" />
 		<Unit filename="BattleAI.h" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="main.cpp" />
diff --git a/AI/EmptyAI/EmptyAI.cbp b/AI/EmptyAI/EmptyAI.cbp
index b506aa93b..cef39e1be 100644
--- a/AI/EmptyAI/EmptyAI.cbp
+++ b/AI/EmptyAI/EmptyAI.cbp
@@ -51,7 +51,6 @@
 		<Unit filename="CEmptyAI.cpp" />
 		<Unit filename="CEmptyAI.h" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="exp_funcs.cpp" />
diff --git a/AI/StupidAI/StupidAI.cbp b/AI/StupidAI/StupidAI.cbp
index 51112af8b..43ed9465e 100644
--- a/AI/StupidAI/StupidAI.cbp
+++ b/AI/StupidAI/StupidAI.cbp
@@ -51,7 +51,6 @@
 			<Add directory="../.." />
 		</Linker>
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="StupidAI.cpp" />
diff --git a/AI/VCAI/VCAI.cbp b/AI/VCAI/VCAI.cbp
index ca9bafe69..8496fd4f1 100644
--- a/AI/VCAI/VCAI.cbp
+++ b/AI/VCAI/VCAI.cbp
@@ -60,7 +60,6 @@
 		<Unit filename="Fuzzy.cpp" />
 		<Unit filename="Fuzzy.h" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="VCAI.cpp" />
diff --git a/client/CMT.cpp b/client/CMT.cpp
index f37a07c4a..380d7248f 100644
--- a/client/CMT.cpp
+++ b/client/CMT.cpp
@@ -193,7 +193,7 @@ static void prog_help(const po::options_description &opts)
 void OSX_checkForUpdates();
 #endif
 
-#ifdef _WIN32
+#if defined(_WIN32) && !defined (__GNUC__)
 int wmain(int argc, wchar_t* argv[])
 #elif defined(__APPLE__)
 int SDL_main(int argc, char *argv[])
diff --git a/client/VCMI_client.cbp b/client/VCMI_client.cbp
index 7a2a48c9a..f9d13b365 100644
--- a/client/VCMI_client.cbp
+++ b/client/VCMI_client.cbp
@@ -116,7 +116,6 @@
 		<Unit filename="NetPacksClient.cpp" />
 		<Unit filename="SDLMain.h" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="VCMI_client.rc">
diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index 9b42313ee..91cc820d4 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -46,6 +46,7 @@
 			<Add option="-Wno-sign-compare" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-overloaded-virtual" />
+			<Add option="-Wno-unused-local-typedefs" />
 			<Add option="-DVCMI_DLL" />
 			<Add option="-DBOOST_THREAD_USE_LIB" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
@@ -62,8 +63,10 @@
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lboost_thread$(#boost.libsuffix)" />
 			<Add option="-lboost_chrono$(#boost.libsuffix)" />
+			<Add option="-lboost_locale$(#boost.libsuffix)" />
 			<Add directory="$(#boost.lib)" />
 			<Add directory="$(#sdl.lib)" />
+			<Add directory="../" />
 		</Linker>
 		<Unit filename="AI_Base.h" />
 		<Unit filename="BattleAction.cpp" />
@@ -143,7 +146,6 @@
 		<Unit filename="ScopeGuard.h" />
 		<Unit filename="StartInfo.h" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Unit filename="StringConstants.h" />
@@ -169,7 +171,6 @@
 		<Unit filename="filesystem/CInputStream.h" />
 		<Unit filename="filesystem/CMemoryStream.cpp" />
 		<Unit filename="filesystem/CMemoryStream.h" />
-		<Unit filename="filesystem/CResourceLoader.cpp" />
 		<Unit filename="filesystem/CZipLoader.cpp" />
 		<Unit filename="filesystem/CZipLoader.h" />
 		<Unit filename="filesystem/Filesystem.cpp" />
diff --git a/lib/minizip/minizip.cbp b/lib/minizip/minizip.cbp
index 8161e1ee1..81c6c8769 100644
--- a/lib/minizip/minizip.cbp
+++ b/lib/minizip/minizip.cbp
@@ -7,6 +7,7 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
+				<Option platforms="Windows;" />
 				<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Debug/" />
 				<Option type="3" />
@@ -19,11 +20,10 @@
 				</Compiler>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/Release/minizip" prefix_auto="1" extension_auto="1" />
+				<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
 				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
-				<Option createDefFile="1" />
 				<Option createStaticLib="1" />
 				<Compiler>
 					<Add option="-O2" />
diff --git a/server/CVCMIServer.cpp b/server/CVCMIServer.cpp
index 38bbc4d9a..2c41222d4 100644
--- a/server/CVCMIServer.cpp
+++ b/server/CVCMIServer.cpp
@@ -32,7 +32,7 @@
 
 #include "../lib/UnlockGuard.h"
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined (__MINGW32__)
 #include <execinfo.h>
 #endif
 
@@ -535,7 +535,7 @@ static void handleCommandOptions(int argc, char *argv[])
 	po::notify(cmdLineOptions);
 }
 
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined (__MINGW32__)
 void handleLinuxSignal(int sig)
 {
 	const int STACKTRACE_SIZE = 100;
@@ -566,7 +566,7 @@ int main(int argc, char** argv)
 {
 	// Installs a sig sev segmentation violation handler
 	// to log stacktrace
-	#ifdef __GNUC__
+	#if defined(__GNUC__) && !defined (__MINGW32__)
 	signal(SIGSEGV, handleLinuxSignal);
 	#endif
 
diff --git a/server/VCMI_server.cbp b/server/VCMI_server.cbp
index 18bfcc9ed..9186a1149 100644
--- a/server/VCMI_server.cbp
+++ b/server/VCMI_server.cbp
@@ -67,7 +67,6 @@
 		<Unit filename="CVCMIServer.h" />
 		<Unit filename="NetPacksServer.cpp" />
 		<Unit filename="StdInc.h">
-			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
 		<Extensions>
diff --git a/vcmi.workspace b/vcmi.workspace
index 8d4d7f2ba..a63f625ec 100644
--- a/vcmi.workspace
+++ b/vcmi.workspace
@@ -2,7 +2,9 @@
 <CodeBlocks_workspace_file>
 	<Workspace title="vcmi">
 		<Project filename="lib/minizip/minizip.cbp" />
-		<Project filename="lib/VCMI_lib.cbp" />
+		<Project filename="lib/VCMI_lib.cbp">
+			<Depends filename="lib/minizip/minizip.cbp" />
+		</Project>
 		<Project filename="client/VCMI_client.cbp">
 			<Depends filename="lib/VCMI_lib.cbp" />
 		</Project>