Make zip external

ParadoxGameConverters · Jan 12, 2025 · 9a7e4f6 · 9a7e4f6
1 parent 85e7581
commit 9a7e4f6
Show file tree

Hide file tree

Showing 7 changed files with 186 additions and 19 deletions.
diff --git a/CommonItems/CommonItems.vcxproj b/CommonItems/CommonItems.vcxproj
@@ -17,7 +17,6 @@
     <ClCompile Include="..\ConvenientParser.cpp" />
     <ClCompile Include="..\ConverterVersion.cpp" />
     <ClCompile Include="..\Date.cpp" />
-    <ClCompile Include="..\external\zip\src\zip.c" />
     <ClCompile Include="..\GameVersion.cpp" />
     <ClCompile Include="..\iconvlite.cpp" />
     <ClCompile Include="..\LinuxUtils.cpp">
@@ -45,8 +44,6 @@
     <ClInclude Include="..\ConvenientParser.h" />
     <ClInclude Include="..\ConverterVersion.h" />
     <ClInclude Include="..\Date.h" />
-    <ClInclude Include="..\external\zip\src\miniz.h" />
-    <ClInclude Include="..\external\zip\src\zip.h" />
     <ClInclude Include="..\GameVersion.h" />
     <ClInclude Include="..\iconvlite.h" />
     <ClInclude Include="..\Localization\LocalizationBlock.h" />

diff --git a/CommonItems/CommonItems.vcxproj.filters b/CommonItems/CommonItems.vcxproj.filters
@@ -4,12 +4,6 @@
     <Filter Include="commonItems">
       <UniqueIdentifier>{569e5cb7-b294-4ea8-991d-ba24d2e9c236}</UniqueIdentifier>
     </Filter>
-    <Filter Include="external">
-      <UniqueIdentifier>{c32ded5e-5cf5-4c96-9d9d-0a332b595382}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="external\zip">
-      <UniqueIdentifier>{cdb3317d-89c8-469e-994a-ccea14e50e98}</UniqueIdentifier>
-    </Filter>
     <Filter Include="commonItems\Localization">
       <UniqueIdentifier>{5e9fa605-7e0b-42ab-9583-fce44952fd6f}</UniqueIdentifier>
     </Filter>
@@ -66,9 +60,6 @@
     <ClCompile Include="..\WinUtils.cpp">
       <Filter>commonItems</Filter>
     </ClCompile>
-    <ClCompile Include="..\external\zip\src\zip.c">
-      <Filter>external\zip</Filter>
-    </ClCompile>
     <ClCompile Include="..\Localization\LocalizationBlock.cpp">
       <Filter>commonItems\Localization</Filter>
     </ClCompile>
@@ -131,12 +122,6 @@
     <ClInclude Include="..\targa.h">
       <Filter>commonItems</Filter>
     </ClInclude>
-    <ClInclude Include="..\external\zip\src\miniz.h">
-      <Filter>external\zip</Filter>
-    </ClInclude>
-    <ClInclude Include="..\external\zip\src\zip.h">
-      <Filter>external\zip</Filter>
-    </ClInclude>
     <ClInclude Include="..\Localization\LocalizationBlock.h">
       <Filter>commonItems\Localization</Filter>
     </ClInclude>

diff --git a/tests/CommonItemsTests.sln b/tests/CommonItemsTests.sln
@@ -6,11 +6,18 @@ MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItemsTests", "CommonItemsTests.vcxproj", "{CC2F3DAC-0BEE-41A5-A39D-3B8A83C5EEB1}"
 	ProjectSection(ProjectDependencies) = postProject
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140} = {3B8EC8C8-4066-46F7-851D-EB762C39C140}
+		{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C} = {BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "..\pch\pch.vcxproj", "{095FC941-B5E2-4439-88D9-587E2029CB68}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "..\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}"
+	ProjectSection(ProjectDependencies) = postProject
+		{095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68}
+		{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C} = {BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "..\zip\zip.vcxproj", "{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,6 +30,8 @@ Global
 		{095FC941-B5E2-4439-88D9-587E2029CB68}.Release|x64.Build.0 = Release|x64
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.ActiveCfg = Release|x64
 		{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.Build.0 = Release|x64
+		{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}.Release|x64.ActiveCfg = Release|x64
+		{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/tests/CommonItemsTests.vcxproj b/tests/CommonItemsTests.vcxproj
@@ -46,7 +46,7 @@
     <Link>
       <SubSystem>Console</SubSystem>
       <AdditionalLibraryDirectories>$(SolutionDir)lib</AdditionalLibraryDirectories>
-      <AdditionalDependencies>CommonItems.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>CommonItems.lib;zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>

diff --git a/zip/zip.vcxproj b/zip/zip.vcxproj
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>17.0</VCProjectVersion>
+    <Keyword>Win32Proj</Keyword>
+    <ProjectGuid>{bd9bc07a-f4ac-44a3-ac06-6fde91181c7c}</ProjectGuid>
+    <RootNamespace>zip</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v143</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>Unicode</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <OutDir>$(SolutionDir)lib\</OutDir>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>TurnOffAllWarnings</WarningLevel>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <SubSystem>Console</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\external\zip\src\miniz.h" />
+    <ClInclude Include="..\external\zip\src\zip.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\external\zip\src\zip.c" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/zip/zip.vcxproj.filters b/zip/zip.vcxproj.filters
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\external\zip\src\miniz.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\external\zip\src\zip.h">
+      <Filter>Source Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\external\zip\src\zip.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+</Project>
diff --git a/zip/zip.vcxproj.user b/zip/zip.vcxproj.user
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup />
+</Project>