1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-26 22:57:00 +02:00

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
This commit is contained in:
AlexVinS 2014-05-21 14:36:18 +04:00 committed by AlexVinS
parent e468e8453b
commit 30fd9987cf
2 changed files with 8 additions and 6 deletions

View File

@ -50,14 +50,15 @@
<Add option="-DVCMI_DLL" /> <Add option="-DVCMI_DLL" />
<Add option="-DBOOST_THREAD_USE_LIB" /> <Add option="-DBOOST_THREAD_USE_LIB" />
<Add option="-D_WIN32_WINNT=0x0501" /> <Add option="-D_WIN32_WINNT=0x0501" />
<Add directory="$(#zlib.include)" />
<Add directory="$(#boost.include)" /> <Add directory="$(#boost.include)" />
<Add directory="$(#sdl.include)" /> <Add directory="$(#sdl2.include)" />
<Add directory="../include" /> <Add directory="../include" />
<Add directory="../lib" /> <Add directory="../lib" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-lws2_32" /> <Add option="-lws2_32" />
<Add option="-lzlib" /> <Add option="-lz" />
<Add option="-lminizip" /> <Add option="-lminizip" />
<Add option="-lboost_filesystem$(#boost.libsuffix)" /> <Add option="-lboost_filesystem$(#boost.libsuffix)" />
<Add option="-lboost_system$(#boost.libsuffix)" /> <Add option="-lboost_system$(#boost.libsuffix)" />
@ -65,7 +66,8 @@
<Add option="-lboost_chrono$(#boost.libsuffix)" /> <Add option="-lboost_chrono$(#boost.libsuffix)" />
<Add option="-lboost_locale$(#boost.libsuffix)" /> <Add option="-lboost_locale$(#boost.libsuffix)" />
<Add directory="$(#boost.lib32)" /> <Add directory="$(#boost.lib32)" />
<Add directory="$(#sdl.lib)" /> <Add directory="$(#zlib.lib)" />
<Add directory="$(#sdl2.lib)" />
<Add directory="../" /> <Add directory="../" />
</Linker> </Linker>
<Unit filename="AI_Base.h" /> <Unit filename="AI_Base.h" />

View File

@ -36,11 +36,11 @@
</Target> </Target>
</Build> </Build>
<Compiler> <Compiler>
<Add directory="$(#sdl.include)" /> <Add directory="$(#zlib.include)" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-lzlib" /> <Add option="-lz" />
<Add directory="$(#sdl.lib)" /> <Add directory="$(#zlib.lib)" />
</Linker> </Linker>
<Unit filename="ioapi.c"> <Unit filename="ioapi.c">
<Option compilerVar="CC" /> <Option compilerVar="CC" />