Просмотр исходного кода

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

AlexVinS 11 лет назад
Родитель
Сommit
30fd9987cf
2 измененных файлов с 8 добавлено и 6 удалено
  1. 5 3
      lib/VCMI_lib.cbp
  2. 3 3
      lib/minizip/minizip.cbp

+ 5 - 3
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" />

+ 3 - 3
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" />