[c::b] project file for minizip, lib & client update (wip)

client/VCMI_client.cbp

@@ -71,14 +71,6 @@
 		<Unit filename="../CCallback.h" />
 		<Unit filename="AdventureMapClasses.cpp" />
 		<Unit filename="AdventureMapClasses.h" />
-		<Unit filename="battle/CBattleAnimations.cpp" />
-		<Unit filename="battle/CBattleAnimations.h" />
-		<Unit filename="battle/CBattleInterface.cpp" />
-		<Unit filename="battle/CBattleInterface.h" />
-		<Unit filename="battle/CBattleInterfaceClasses.cpp" />
-		<Unit filename="battle/CBattleInterfaceClasses.h" />
-		<Unit filename="battle/CCreatureAnimation.cpp" />
-		<Unit filename="battle/CCreatureAnimation.h" />
 		<Unit filename="CAdvmapInterface.cpp" />
 		<Unit filename="CAdvmapInterface.h" />
 		<Unit filename="CAnimation.cpp" />
@@ -98,6 +90,7 @@
 		<Unit filename="CKingdomInterface.cpp" />
 		<Unit filename="CKingdomInterface.h" />
 		<Unit filename="CMT.cpp" />
+		<Unit filename="CMT.h" />
 		<Unit filename="CMessage.cpp" />
 		<Unit filename="CMessage.h" />
 		<Unit filename="CMusicHandler.cpp" />
@@ -121,10 +114,22 @@
 		<Unit filename="Graphics.cpp" />
 		<Unit filename="Graphics.h" />
 		<Unit filename="NetPacksClient.cpp" />
+		<Unit filename="SDLMain.h" />
 		<Unit filename="StdInc.h">
 			<Option compile="1" />
 			<Option weight="0" />
 		</Unit>
+		<Unit filename="VCMI_client.rc">
+			<Option compilerVar="WINDRES" />
+		</Unit>
+		<Unit filename="battle/CBattleAnimations.cpp" />
+		<Unit filename="battle/CBattleAnimations.h" />
+		<Unit filename="battle/CBattleInterface.cpp" />
+		<Unit filename="battle/CBattleInterface.h" />
+		<Unit filename="battle/CBattleInterfaceClasses.cpp" />
+		<Unit filename="battle/CBattleInterfaceClasses.h" />
+		<Unit filename="battle/CCreatureAnimation.cpp" />
+		<Unit filename="battle/CCreatureAnimation.h" />
 		<Unit filename="gui/CCursorHandler.cpp" />
 		<Unit filename="gui/CCursorHandler.h" />
 		<Unit filename="gui/CGuiHandler.cpp" />
@@ -140,9 +145,6 @@
 		<Unit filename="gui/SDL_Extensions.cpp" />
 		<Unit filename="gui/SDL_Extensions.h" />
 		<Unit filename="gui/SDL_Pixels.h" />
-		<Unit filename="VCMI_client.rc">
-			<Option compilerVar="WINDRES" />
-		</Unit>
 		<Unit filename="mapHandler.cpp" />
 		<Unit filename="mapHandler.h" />
 		<Unit filename="resource.h" />

lib/VCMI_lib.cbp

@@ -57,6 +57,7 @@
 		<Linker>
 			<Add option="-lws2_32" />
 			<Add option="-lzlib" />
+			<Add option="-lminizip" />
 			<Add option="-lboost_filesystem$(#boost.libsuffix)" />
 			<Add option="-lboost_system$(#boost.libsuffix)" />
 			<Add option="-lboost_thread$(#boost.libsuffix)" />
@@ -116,24 +117,7 @@
 		<Unit filename="Connection.cpp" />
 		<Unit filename="Connection.h" />
 		<Unit filename="ConstTransitivePtr.h" />
-		<Unit filename="filesystem/CBinaryReader.cpp" />
-		<Unit filename="filesystem/CBinaryReader.h" />
-		<Unit filename="filesystem/CCompressedStream.cpp" />
-		<Unit filename="filesystem/CCompressedStream.h" />
-		<Unit filename="filesystem/CFileInfo.cpp" />
-		<Unit filename="filesystem/CFileInfo.h" />
-		<Unit filename="filesystem/CFileInputStream.cpp" />
-		<Unit filename="filesystem/CFileInputStream.h" />
-		<Unit filename="filesystem/CFilesystemLoader.cpp" />
-		<Unit filename="filesystem/CFilesystemLoader.h" />
-		<Unit filename="filesystem/CInputStream.h" />
-		<Unit filename="filesystem/CLodArchiveLoader.cpp" />
-		<Unit filename="filesystem/CLodArchiveLoader.h" />
-		<Unit filename="filesystem/CMemoryStream.cpp" />
-		<Unit filename="filesystem/CMemoryStream.h" />
-		<Unit filename="filesystem/CResourceLoader.cpp" />
-		<Unit filename="filesystem/CResourceLoader.h" />
-		<Unit filename="filesystem/ISimpleResourceLoader.h" />
+		<Unit filename="FunctionList.h" />
 		<Unit filename="GameConstants.cpp" />
 		<Unit filename="GameConstants.h" />
 		<Unit filename="HeroBonus.cpp" />
@@ -142,33 +126,21 @@
 		<Unit filename="IGameCallback.cpp" />
 		<Unit filename="IGameCallback.h" />
 		<Unit filename="IGameEventsReceiver.h" />
+		<Unit filename="IHandlerBase.h" />
 		<Unit filename="Interprocess.h" />
+		<Unit filename="JsonDetail.cpp" />
+		<Unit filename="JsonDetail.h" />
 		<Unit filename="JsonNode.cpp" />
 		<Unit filename="JsonNode.h" />
-		<Unit filename="mapping/CCampaignHandler.cpp" />
-		<Unit filename="mapping/CCampaignHandler.h" />
-		<Unit filename="mapping/CMap.cpp" />
-		<Unit filename="mapping/CMap.h" />
-		<Unit filename="mapping/CMapEditManager.cpp" />
-		<Unit filename="mapping/CMapEditManager.h" />
-		<Unit filename="mapping/CMapInfo.cpp" />
-		<Unit filename="mapping/CMapInfo.h" />
-		<Unit filename="mapping/CMapService.cpp" />
-		<Unit filename="mapping/CMapService.h" />
-		<Unit filename="mapping/MapFormatH3M.cpp" />
-		<Unit filename="mapping/MapFormatH3M.h" />
+		<Unit filename="LogicalExpression.cpp" />
+		<Unit filename="LogicalExpression.h" />
 		<Unit filename="NetPacks.h" />
 		<Unit filename="NetPacksLib.cpp" />
-		<Unit filename="rmg/CMapGenerator.cpp" />
-		<Unit filename="rmg/CMapGenerator.h" />
-		<Unit filename="logging/CLogger.cpp" />
-		<Unit filename="logging/CLogger.h" />
-		<Unit filename="logging/CBasicLogConfigurator.cpp" />
-		<Unit filename="logging/CBasicLogConfigurator.h" />
 		<Unit filename="RegisterTypes.cpp" />
 		<Unit filename="RegisterTypes.h" />
 		<Unit filename="ResourceSet.cpp" />
 		<Unit filename="ResourceSet.h" />
+		<Unit filename="ScopeGuard.h" />
 		<Unit filename="StartInfo.h" />
 		<Unit filename="StdInc.h">
 			<Option compile="1" />
@@ -180,7 +152,64 @@
 		<Unit filename="VCMIDirs.h" />
 		<Unit filename="VCMI_Lib.cpp" />
 		<Unit filename="VCMI_Lib.h" />
+		<Unit filename="filesystem/AdapterLoaders.cpp" />
+		<Unit filename="filesystem/AdapterLoaders.h" />
+		<Unit filename="filesystem/CArchiveLoader.cpp" />
+		<Unit filename="filesystem/CArchiveLoader.h" />
+		<Unit filename="filesystem/CBinaryReader.cpp" />
+		<Unit filename="filesystem/CBinaryReader.h" />
+		<Unit filename="filesystem/CCompressedStream.cpp" />
+		<Unit filename="filesystem/CCompressedStream.h" />
+		<Unit filename="filesystem/CFileInfo.cpp" />
+		<Unit filename="filesystem/CFileInfo.h" />
+		<Unit filename="filesystem/CFileInputStream.cpp" />
+		<Unit filename="filesystem/CFileInputStream.h" />
+		<Unit filename="filesystem/CFilesystemLoader.cpp" />
+		<Unit filename="filesystem/CFilesystemLoader.h" />
+		<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" />
+		<Unit filename="filesystem/Filesystem.h" />
+		<Unit filename="filesystem/ISimpleResourceLoader.h" />
+		<Unit filename="filesystem/ResourceID.cpp" />
+		<Unit filename="filesystem/ResourceID.h" />
 		<Unit filename="int3.h" />
+		<Unit filename="logging/CBasicLogConfigurator.cpp" />
+		<Unit filename="logging/CBasicLogConfigurator.h" />
+		<Unit filename="logging/CLogger.cpp" />
+		<Unit filename="logging/CLogger.h" />
+		<Unit filename="mapping/CCampaignHandler.cpp" />
+		<Unit filename="mapping/CCampaignHandler.h" />
+		<Unit filename="mapping/CMap.cpp" />
+		<Unit filename="mapping/CMap.h" />
+		<Unit filename="mapping/CMapEditManager.cpp" />
+		<Unit filename="mapping/CMapEditManager.h" />
+		<Unit filename="mapping/CMapInfo.cpp" />
+		<Unit filename="mapping/CMapInfo.h" />
+		<Unit filename="mapping/CMapService.cpp" />
+		<Unit filename="mapping/CMapService.h" />
+		<Unit filename="mapping/MapFormatH3M.cpp" />
+		<Unit filename="mapping/MapFormatH3M.h" />
+		<Unit filename="mapping/MapFormatJson.cpp" />
+		<Unit filename="mapping/MapFormatJson.h" />
+		<Unit filename="rmg/CMapGenOptions.cpp" />
+		<Unit filename="rmg/CMapGenOptions.h" />
+		<Unit filename="rmg/CMapGenerator.cpp" />
+		<Unit filename="rmg/CMapGenerator.h" />
+		<Unit filename="rmg/CRmgTemplate.cpp" />
+		<Unit filename="rmg/CRmgTemplate.h" />
+		<Unit filename="rmg/CRmgTemplateStorage.cpp" />
+		<Unit filename="rmg/CRmgTemplateStorage.h" />
+		<Unit filename="rmg/CRmgTemplateZone.cpp" />
+		<Unit filename="rmg/CRmgTemplateZone.h" />
+		<Unit filename="rmg/CZoneGraphGenerator.cpp" />
+		<Unit filename="rmg/CZoneGraphGenerator.h" />
+		<Unit filename="rmg/CZonePlacer.cpp" />
+		<Unit filename="rmg/CZonePlacer.h" />
 		<Unit filename="vcmi_endian.h" />
 		<Extensions>
 			<code_completion />

lib/minizip/minizip.cbp

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="minizip" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="../../minizip" prefix_auto="1" extension_auto="1" />
+				<Option object_output="obj/Debug/" />
+				<Option type="3" />
+				<Option compiler="gcc" />
+				<Option createStaticLib="1" />
+				<Compiler>
+					<Add option="-Wall" />
+					<Add option="-g" />
+					<Add option="-DBUILD_DLL" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="bin/Release/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" />
+					<Add option="-Wall" />
+					<Add option="-DBUILD_DLL" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add directory="$(#sdl.include)" />
+		</Compiler>
+		<Linker>
+			<Add option="-lzlib" />
+			<Add directory="$(#sdl.lib)" />
+		</Linker>
+		<Unit filename="ioapi.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="ioapi.h" />
+		<Unit filename="unzip.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="unzip.h" />
+		<Unit filename="zip.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="zip.h" />
+		<Extensions>
+			<code_completion />
+			<envvars />
+			<debugger />
+			<lib_finder disable_auto="1" />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>

vcmi.workspace

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <CodeBlocks_workspace_file>
 	<Workspace title="vcmi">
+		<Project filename="lib/minizip/minizip.cbp" />
 		<Project filename="lib/VCMI_lib.cbp" />
 		<Project filename="client/VCMI_client.cbp">
 			<Depends filename="lib/VCMI_lib.cbp" />