From 30fd9987cf90233d3d88254d0c847790a65fd478 Mon Sep 17 00:00:00 2001
From: AlexVinS <alexvins@mail.ru>
Date: Wed, 21 May 2014 14:36:18 +0400
Subject: [PATCH] change minizip.cbp, VCMI_lib.cbp to new externals layout *
 static link with zlib for now - I don`t want to mix with SDLs zlib

---
 lib/VCMI_lib.cbp        | 8 +++++---
 lib/minizip/minizip.cbp | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/lib/VCMI_lib.cbp b/lib/VCMI_lib.cbp
index 0bf21859e..773e3e151 100644
--- a/lib/VCMI_lib.cbp
+++ b/lib/VCMI_lib.cbp
@@ -50,14 +50,15 @@
 			<Add option="-DVCMI_DLL" />
 			<Add option="-DBOOST_THREAD_USE_LIB" />
 			<Add option="-D_WIN32_WINNT=0x0501" />
+			<Add directory="$(#zlib.include)" />
 			<Add directory="$(#boost.include)" />
-			<Add directory="$(#sdl.include)" />
+			<Add directory="$(#sdl2.include)" />
 			<Add directory="../include" />
 			<Add directory="../lib" />
 		</Compiler>
 		<Linker>
 			<Add option="-lws2_32" />
-			<Add option="-lzlib" />
+			<Add option="-lz" />
 			<Add option="-lminizip" />
 			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
 			<Add option="-lboost_system$(#boost.libsuffix)" />
@@ -65,7 +66,8 @@
 			<Add option="-lboost_chrono$(#boost.libsuffix)" />
 			<Add option="-lboost_locale$(#boost.libsuffix)" />
 			<Add directory="$(#boost.lib32)" />
-			<Add directory="$(#sdl.lib)" />
+			<Add directory="$(#zlib.lib)" />
+			<Add directory="$(#sdl2.lib)" />
 			<Add directory="../" />
 		</Linker>
 		<Unit filename="AI_Base.h" />
diff --git a/lib/minizip/minizip.cbp b/lib/minizip/minizip.cbp
index 81c6c8769..aa20e5c73 100644
--- a/lib/minizip/minizip.cbp
+++ b/lib/minizip/minizip.cbp
@@ -36,11 +36,11 @@
 			</Target>
 		</Build>
 		<Compiler>
-			<Add directory="$(#sdl.include)" />
+			<Add directory="$(#zlib.include)" />
 		</Compiler>
 		<Linker>
-			<Add option="-lzlib" />
-			<Add directory="$(#sdl.lib)" />
+			<Add option="-lz" />
+			<Add directory="$(#zlib.lib)" />
 		</Linker>
 		<Unit filename="ioapi.c">
 			<Option compilerVar="CC" />