Skip to content

Commit 9a7e4f6

Browse files
IdhrendurIdhrendur
committed
Make zip external
1 parent 85e7581 commit 9a7e4f6

File tree

7 files changed

+186
-19
lines changed

7 files changed

+186
-19
lines changed

‎CommonItems/CommonItems.vcxproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
<ClCompile Include="..\ConvenientParser.cpp" />
1818
<ClCompile Include="..\ConverterVersion.cpp" />
1919
<ClCompile Include="..\Date.cpp" />
20-
<ClCompile Include="..\external\zip\src\zip.c" />
2120
<ClCompile Include="..\GameVersion.cpp" />
2221
<ClCompile Include="..\iconvlite.cpp" />
2322
<ClCompile Include="..\LinuxUtils.cpp">
@@ -45,8 +44,6 @@
4544
<ClInclude Include="..\ConvenientParser.h" />
4645
<ClInclude Include="..\ConverterVersion.h" />
4746
<ClInclude Include="..\Date.h" />
48-
<ClInclude Include="..\external\zip\src\miniz.h" />
49-
<ClInclude Include="..\external\zip\src\zip.h" />
5047
<ClInclude Include="..\GameVersion.h" />
5148
<ClInclude Include="..\iconvlite.h" />
5249
<ClInclude Include="..\Localization\LocalizationBlock.h" />

‎CommonItems/CommonItems.vcxproj.filters‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@
44
<Filter Include="commonItems">
55
<UniqueIdentifier>{569e5cb7-b294-4ea8-991d-ba24d2e9c236}</UniqueIdentifier>
66
</Filter>
7-
<Filter Include="external">
8-
<UniqueIdentifier>{c32ded5e-5cf5-4c96-9d9d-0a332b595382}</UniqueIdentifier>
9-
</Filter>
10-
<Filter Include="external\zip">
11-
<UniqueIdentifier>{cdb3317d-89c8-469e-994a-ccea14e50e98}</UniqueIdentifier>
12-
</Filter>
137
<Filter Include="commonItems\Localization">
148
<UniqueIdentifier>{5e9fa605-7e0b-42ab-9583-fce44952fd6f}</UniqueIdentifier>
159
</Filter>
@@ -66,9 +60,6 @@
6660
<ClCompile Include="..\WinUtils.cpp">
6761
<Filter>commonItems</Filter>
6862
</ClCompile>
69-
<ClCompile Include="..\external\zip\src\zip.c">
70-
<Filter>external\zip</Filter>
71-
</ClCompile>
7263
<ClCompile Include="..\Localization\LocalizationBlock.cpp">
7364
<Filter>commonItems\Localization</Filter>
7465
</ClCompile>
@@ -131,12 +122,6 @@
131122
<ClInclude Include="..\targa.h">
132123
<Filter>commonItems</Filter>
133124
</ClInclude>
134-
<ClInclude Include="..\external\zip\src\miniz.h">
135-
<Filter>external\zip</Filter>
136-
</ClInclude>
137-
<ClInclude Include="..\external\zip\src\zip.h">
138-
<Filter>external\zip</Filter>
139-
</ClInclude>
140125
<ClInclude Include="..\Localization\LocalizationBlock.h">
141126
<Filter>commonItems\Localization</Filter>
142127
</ClInclude>

‎tests/CommonItemsTests.sln‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,18 @@ MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItemsTests", "CommonItemsTests.vcxproj", "{CC2F3DAC-0BEE-41A5-A39D-3B8A83C5EEB1}"
77
ProjectSection(ProjectDependencies) = postProject
88
{3B8EC8C8-4066-46F7-851D-EB762C39C140} = {3B8EC8C8-4066-46F7-851D-EB762C39C140}
9+
{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C} = {BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}
910
EndProjectSection
1011
EndProject
1112
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pch", "..\pch\pch.vcxproj", "{095FC941-B5E2-4439-88D9-587E2029CB68}"
1213
EndProject
1314
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonItems", "..\CommonItems\CommonItems.vcxproj", "{3B8EC8C8-4066-46F7-851D-EB762C39C140}"
15+
ProjectSection(ProjectDependencies) = postProject
16+
{095FC941-B5E2-4439-88D9-587E2029CB68} = {095FC941-B5E2-4439-88D9-587E2029CB68}
17+
{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C} = {BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}
18+
EndProjectSection
19+
EndProject
20+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zip", "..\zip\zip.vcxproj", "{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}"
1421
EndProject
1522
Global
1623
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -23,6 +30,8 @@ Global
2330
{095FC941-B5E2-4439-88D9-587E2029CB68}.Release|x64.Build.0 = Release|x64
2431
{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.ActiveCfg = Release|x64
2532
{3B8EC8C8-4066-46F7-851D-EB762C39C140}.Release|x64.Build.0 = Release|x64
33+
{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}.Release|x64.ActiveCfg = Release|x64
34+
{BD9BC07A-F4AC-44A3-AC06-6FDE91181C7C}.Release|x64.Build.0 = Release|x64
2635
EndGlobalSection
2736
GlobalSection(SolutionProperties) = preSolution
2837
HideSolutionNode = FALSE

‎tests/CommonItemsTests.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
<Link>
4747
<SubSystem>Console</SubSystem>
4848
<AdditionalLibraryDirectories>$(SolutionDir)lib</AdditionalLibraryDirectories>
49-
<AdditionalDependencies>CommonItems.lib;%(AdditionalDependencies)</AdditionalDependencies>
49+
<AdditionalDependencies>CommonItems.lib;zip.lib;%(AdditionalDependencies)</AdditionalDependencies>
5050
</Link>
5151
</ItemDefinitionGroup>
5252
<ItemGroup>

‎zip/zip.vcxproj‎

Lines changed: 142 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,142 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Release|Win32">
9+
<Configuration>Release</Configuration>
10+
<Platform>Win32</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Debug|x64">
13+
<Configuration>Debug</Configuration>
14+
<Platform>x64</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<PropertyGroup Label="Globals">
22+
<VCProjectVersion>17.0</VCProjectVersion>
23+
<Keyword>Win32Proj</Keyword>
24+
<ProjectGuid>{bd9bc07a-f4ac-44a3-ac06-6fde91181c7c}</ProjectGuid>
25+
<RootNamespace>zip</RootNamespace>
26+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
27+
</PropertyGroup>
28+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
29+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
30+
<ConfigurationType>Application</ConfigurationType>
31+
<UseDebugLibraries>true</UseDebugLibraries>
32+
<PlatformToolset>v143</PlatformToolset>
33+
<CharacterSet>Unicode</CharacterSet>
34+
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
36+
<ConfigurationType>Application</ConfigurationType>
37+
<UseDebugLibraries>false</UseDebugLibraries>
38+
<PlatformToolset>v143</PlatformToolset>
39+
<WholeProgramOptimization>true</WholeProgramOptimization>
40+
<CharacterSet>Unicode</CharacterSet>
41+
</PropertyGroup>
42+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
43+
<ConfigurationType>Application</ConfigurationType>
44+
<UseDebugLibraries>true</UseDebugLibraries>
45+
<PlatformToolset>v143</PlatformToolset>
46+
<CharacterSet>Unicode</CharacterSet>
47+
</PropertyGroup>
48+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
49+
<ConfigurationType>StaticLibrary</ConfigurationType>
50+
<UseDebugLibraries>false</UseDebugLibraries>
51+
<PlatformToolset>v143</PlatformToolset>
52+
<WholeProgramOptimization>true</WholeProgramOptimization>
53+
<CharacterSet>Unicode</CharacterSet>
54+
</PropertyGroup>
55+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
56+
<ImportGroup Label="ExtensionSettings">
57+
</ImportGroup>
58+
<ImportGroup Label="Shared">
59+
</ImportGroup>
60+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
61+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
62+
</ImportGroup>
63+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
64+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
65+
</ImportGroup>
66+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
67+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
68+
</ImportGroup>
69+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
70+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
71+
</ImportGroup>
72+
<PropertyGroup Label="UserMacros" />
73+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
74+
<OutDir>$(SolutionDir)lib\</OutDir>
75+
</PropertyGroup>
76+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
77+
<ClCompile>
78+
<WarningLevel>Level3</WarningLevel>
79+
<SDLCheck>true</SDLCheck>
80+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
81+
<ConformanceMode>true</ConformanceMode>
82+
</ClCompile>
83+
<Link>
84+
<SubSystem>Console</SubSystem>
85+
<GenerateDebugInformation>true</GenerateDebugInformation>
86+
</Link>
87+
</ItemDefinitionGroup>
88+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
89+
<ClCompile>
90+
<WarningLevel>Level3</WarningLevel>
91+
<FunctionLevelLinking>true</FunctionLevelLinking>
92+
<IntrinsicFunctions>true</IntrinsicFunctions>
93+
<SDLCheck>true</SDLCheck>
94+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
95+
<ConformanceMode>true</ConformanceMode>
96+
</ClCompile>
97+
<Link>
98+
<SubSystem>Console</SubSystem>
99+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
100+
<OptimizeReferences>true</OptimizeReferences>
101+
<GenerateDebugInformation>true</GenerateDebugInformation>
102+
</Link>
103+
</ItemDefinitionGroup>
104+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
105+
<ClCompile>
106+
<WarningLevel>Level3</WarningLevel>
107+
<SDLCheck>true</SDLCheck>
108+
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
109+
<ConformanceMode>true</ConformanceMode>
110+
</ClCompile>
111+
<Link>
112+
<SubSystem>Console</SubSystem>
113+
<GenerateDebugInformation>true</GenerateDebugInformation>
114+
</Link>
115+
</ItemDefinitionGroup>
116+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
117+
<ClCompile>
118+
<WarningLevel>TurnOffAllWarnings</WarningLevel>
119+
<FunctionLevelLinking>true</FunctionLevelLinking>
120+
<IntrinsicFunctions>true</IntrinsicFunctions>
121+
<SDLCheck>true</SDLCheck>
122+
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123+
<ConformanceMode>true</ConformanceMode>
124+
</ClCompile>
125+
<Link>
126+
<SubSystem>Console</SubSystem>
127+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
128+
<OptimizeReferences>true</OptimizeReferences>
129+
<GenerateDebugInformation>true</GenerateDebugInformation>
130+
</Link>
131+
</ItemDefinitionGroup>
132+
<ItemGroup>
133+
<ClInclude Include="..\external\zip\src\miniz.h" />
134+
<ClInclude Include="..\external\zip\src\zip.h" />
135+
</ItemGroup>
136+
<ItemGroup>
137+
<ClCompile Include="..\external\zip\src\zip.c" />
138+
</ItemGroup>
139+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
140+
<ImportGroup Label="ExtensionTargets">
141+
</ImportGroup>
142+
</Project>

‎zip/zip.vcxproj.filters‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Header Files">
9+
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
10+
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
11+
</Filter>
12+
<Filter Include="Resource Files">
13+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
14+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
15+
</Filter>
16+
</ItemGroup>
17+
<ItemGroup>
18+
<ClInclude Include="..\external\zip\src\miniz.h">
19+
<Filter>Source Files</Filter>
20+
</ClInclude>
21+
<ClInclude Include="..\external\zip\src\zip.h">
22+
<Filter>Source Files</Filter>
23+
</ClInclude>
24+
</ItemGroup>
25+
<ItemGroup>
26+
<ClCompile Include="..\external\zip\src\zip.c">
27+
<Filter>Source Files</Filter>
28+
</ClCompile>
29+
</ItemGroup>
30+
</Project>

‎zip/zip.vcxproj.user‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup />
4+
</Project>

0 commit comments

Comments
 (0)