Skip to content

Commit 8b1d0f3

Browse files
uhhKnifeuhhKnife
committed
Refactor
1 parent 1e98556 commit 8b1d0f3

18 files changed

+722
-964
lines changed

‎build/linker.vcxproj‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,26 @@
1010
<Platform>x64</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
13-
1413
<PropertyGroup Label="Globals">
1514
<VCProjectVersion>16.0</VCProjectVersion>
1615
<ProjectGuid>{FEDCBA98-FEDC-FEDC-FEDC-FEDCBA98FEDC}</ProjectGuid>
1716
<RootNamespace>ffTools_Linker</RootNamespace>
1817
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1918
</PropertyGroup>
20-
2119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
22-
2320
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
2421
<ConfigurationType>Application</ConfigurationType>
2522
<UseDebugLibraries>true</UseDebugLibraries>
26-
<PlatformToolset>v143</PlatformToolset>
23+
<PlatformToolset>v145</PlatformToolset>
2724
<CharacterSet>Unicode</CharacterSet>
2825
</PropertyGroup>
29-
3026
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3127
<ConfigurationType>Application</ConfigurationType>
3228
<UseDebugLibraries>false</UseDebugLibraries>
33-
<PlatformToolset>v143</PlatformToolset>
29+
<PlatformToolset>v145</PlatformToolset>
3430
<WholeProgramOptimization>true</WholeProgramOptimization>
3531
<CharacterSet>Unicode</CharacterSet>
3632
</PropertyGroup>
37-
3833
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3934
<ImportGroup Label="ExtensionSettings">
4035
</ImportGroup>
@@ -46,21 +41,17 @@
4641
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
4742
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4843
</ImportGroup>
49-
5044
<PropertyGroup Label="UserMacros" />
51-
5245
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5346
<LinkIncremental>true</LinkIncremental>
5447
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
5548
<IntDir>$(SolutionDir)obj\$(Configuration)\linker\</IntDir>
5649
</PropertyGroup>
57-
5850
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5951
<LinkIncremental>false</LinkIncremental>
6052
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
6153
<IntDir>$(SolutionDir)obj\$(Configuration)\linker\</IntDir>
6254
</PropertyGroup>
63-
6455
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6556
<ClCompile>
6657
<WarningLevel>Level4</WarningLevel>
@@ -74,15 +65,14 @@
7465
<GenerateDebugInformation>true</GenerateDebugInformation>
7566
</Link>
7667
</ItemDefinitionGroup>
77-
7868
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7969
<ClCompile>
8070
<WarningLevel>Level4</WarningLevel>
8171
<FunctionLevelLinking>true</FunctionLevelLinking>
8272
<IntrinsicFunctions>true</IntrinsicFunctions>
8373
<SDLCheck>true</SDLCheck>
8474
<PreprocessorDefinitions>NDEBUG;_CONSOLE;MINIZ_NO_STDIO;MINIZ_NO_ARCHIVE_APIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
85-
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>$(ProjectDir)..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8676
<LanguageStandard>stdcpp17</LanguageStandard>
8777
</ClCompile>
8878
<Link>
@@ -92,41 +82,35 @@
9282
<OptimizeReferences>true</OptimizeReferences>
9383
</Link>
9484
</ItemDefinitionGroup>
95-
9685
<ItemGroup>
86+
<ClCompile Include="..\src\include\miniz.c" />
9787
<ClCompile Include="..\src\linker.cpp" />
9888
<ClCompile Include="..\src\assets.cpp" />
99-
<ClCompile Include="..\include\miniz.c">
100-
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
101-
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp17</LanguageStandard>
102-
</ClCompile>
89+
<ClCompile Include="..\src\handlers\localize.cpp" />
90+
<ClCompile Include="..\src\handlers\rawfile.cpp" />
91+
<ClCompile Include="..\src\handlers\stringtable.cpp" />
10392
</ItemGroup>
104-
10593
<ItemGroup>
106-
<ClInclude Include="..\include\types.hpp">
107-
<Filter>include</Filter>
108-
</ClInclude>
109-
<ClInclude Include="..\include\util.hpp">
94+
<ClInclude Include="..\src\include\types.hpp">
11095
<Filter>include</Filter>
11196
</ClInclude>
112-
<ClInclude Include="..\include\loc.hpp">
97+
<ClInclude Include="..\src\include\util.hpp">
11398
<Filter>include</Filter>
11499
</ClInclude>
115-
<ClInclude Include="..\include\binary_io.hpp">
100+
<ClInclude Include="..\src\include\binary_io.hpp">
116101
<Filter>include</Filter>
117102
</ClInclude>
118-
<ClInclude Include="..\include\compression.hpp">
103+
<ClInclude Include="..\src\include\compression.hpp">
119104
<Filter>include</Filter>
120105
</ClInclude>
121-
<ClInclude Include="..\include\assets.hpp">
106+
<ClInclude Include="..\src\include\assets.hpp">
122107
<Filter>include</Filter>
123108
</ClInclude>
124-
<ClInclude Include="..\include\miniz.h">
109+
<ClInclude Include="..\src\include\miniz.h">
125110
<Filter>include</Filter>
126111
</ClInclude>
127112
</ItemGroup>
128-
129113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
130114
<ImportGroup Label="ExtensionTargets">
131115
</ImportGroup>
132-
</Project>
116+
</Project>

‎build/linker.vcxproj.filters‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,46 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="..\src\linker.cpp" />
5-
<ClCompile Include="..\include\miniz.c">
5+
<ClCompile Include="..\src\assets.cpp" />
6+
<ClCompile Include="..\src\handlers\localize.cpp">
7+
<Filter>handlers</Filter>
8+
</ClCompile>
9+
<ClCompile Include="..\src\handlers\rawfile.cpp">
10+
<Filter>handlers</Filter>
11+
</ClCompile>
12+
<ClCompile Include="..\src\handlers\stringtable.cpp">
13+
<Filter>handlers</Filter>
14+
</ClCompile>
15+
<ClCompile Include="..\src\include\miniz.c">
616
<Filter>include</Filter>
717
</ClCompile>
8-
<ClCompile Include="..\src\assets.cpp" />
918
</ItemGroup>
1019
<ItemGroup>
11-
<ClInclude Include="..\include\binary_io.hpp">
12-
<Filter>include</Filter>
13-
</ClInclude>
14-
<ClInclude Include="..\include\compression.hpp">
20+
<ClInclude Include="..\src\include\binary_io.hpp">
1521
<Filter>include</Filter>
1622
</ClInclude>
17-
<ClInclude Include="..\include\loc.hpp">
23+
<ClInclude Include="..\src\include\assets.hpp">
1824
<Filter>include</Filter>
1925
</ClInclude>
20-
<ClInclude Include="..\include\miniz.h">
26+
<ClInclude Include="..\src\include\compression.hpp">
2127
<Filter>include</Filter>
2228
</ClInclude>
23-
<ClInclude Include="..\include\types.hpp">
29+
<ClInclude Include="..\src\include\types.hpp">
2430
<Filter>include</Filter>
2531
</ClInclude>
26-
<ClInclude Include="..\include\util.hpp">
32+
<ClInclude Include="..\src\include\miniz.h">
2733
<Filter>include</Filter>
2834
</ClInclude>
29-
<ClInclude Include="..\include\assets.hpp">
35+
<ClInclude Include="..\src\include\util.hpp">
3036
<Filter>include</Filter>
3137
</ClInclude>
3238
</ItemGroup>
3339
<ItemGroup>
3440
<Filter Include="include">
3541
<UniqueIdentifier>{d91b9e54-0524-4516-af0e-1075abd76125}</UniqueIdentifier>
3642
</Filter>
43+
<Filter Include="handlers">
44+
<UniqueIdentifier>{bf306e3a-3e01-4895-a7b5-b0c972dbf8fd}</UniqueIdentifier>
45+
</Filter>
3746
</ItemGroup>
3847
</Project>

‎build/unlinker.vcxproj‎

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,31 +10,26 @@
1010
<Platform>x64</Platform>
1111
</ProjectConfiguration>
1212
</ItemGroup>
13-
1413
<PropertyGroup Label="Globals">
1514
<VCProjectVersion>16.0</VCProjectVersion>
1615
<ProjectGuid>{12345678-1234-1234-1234-123456789012}</ProjectGuid>
1716
<RootNamespace>ffTools_Unlinker</RootNamespace>
1817
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
1918
</PropertyGroup>
20-
2119
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
22-
2320
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
2421
<ConfigurationType>Application</ConfigurationType>
2522
<UseDebugLibraries>true</UseDebugLibraries>
26-
<PlatformToolset>v143</PlatformToolset>
23+
<PlatformToolset>v145</PlatformToolset>
2724
<CharacterSet>Unicode</CharacterSet>
2825
</PropertyGroup>
29-
3026
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
3127
<ConfigurationType>Application</ConfigurationType>
3228
<UseDebugLibraries>false</UseDebugLibraries>
33-
<PlatformToolset>v143</PlatformToolset>
29+
<PlatformToolset>v145</PlatformToolset>
3430
<WholeProgramOptimization>true</WholeProgramOptimization>
3531
<CharacterSet>Unicode</CharacterSet>
3632
</PropertyGroup>
37-
3833
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3934
<ImportGroup Label="ExtensionSettings">
4035
</ImportGroup>
@@ -46,21 +41,17 @@
4641
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
4742
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4843
</ImportGroup>
49-
5044
<PropertyGroup Label="UserMacros" />
51-
5245
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5346
<LinkIncremental>true</LinkIncremental>
5447
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
5548
<IntDir>$(SolutionDir)obj\$(Configuration)\unlinker\</IntDir>
5649
</PropertyGroup>
57-
5850
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
5951
<LinkIncremental>false</LinkIncremental>
6052
<OutDir>$(SolutionDir)bin\$(Configuration)\</OutDir>
6153
<IntDir>$(SolutionDir)obj\$(Configuration)\unlinker\</IntDir>
6254
</PropertyGroup>
63-
6455
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
6556
<ClCompile>
6657
<WarningLevel>Level4</WarningLevel>
@@ -74,15 +65,14 @@
7465
<GenerateDebugInformation>true</GenerateDebugInformation>
7566
</Link>
7667
</ItemDefinitionGroup>
77-
7868
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7969
<ClCompile>
8070
<WarningLevel>Level4</WarningLevel>
8171
<FunctionLevelLinking>true</FunctionLevelLinking>
8272
<IntrinsicFunctions>true</IntrinsicFunctions>
8373
<SDLCheck>true</SDLCheck>
8474
<PreprocessorDefinitions>NDEBUG;_CONSOLE;MINIZ_NO_STDIO;MINIZ_NO_ARCHIVE_APIS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
85-
<AdditionalIncludeDirectories>$(ProjectDir)..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
75+
<AdditionalIncludeDirectories>$(ProjectDir)..\src\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8676
<LanguageStandard>stdcpp17</LanguageStandard>
8777
</ClCompile>
8878
<Link>
@@ -92,41 +82,35 @@
9282
<OptimizeReferences>true</OptimizeReferences>
9383
</Link>
9484
</ItemDefinitionGroup>
95-
9685
<ItemGroup>
86+
<ClCompile Include="..\src\include\miniz.c" />
9787
<ClCompile Include="..\src\unlinker.cpp" />
9888
<ClCompile Include="..\src\assets.cpp" />
99-
<ClCompile Include="..\include\miniz.c">
100-
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">stdcpp17</LanguageStandard>
101-
<LanguageStandard Condition="'$(Configuration)|$(Platform)'=='Release|x64'">stdcpp17</LanguageStandard>
102-
</ClCompile>
89+
<ClCompile Include="..\src\handlers\localize.cpp" />
90+
<ClCompile Include="..\src\handlers\rawfile.cpp" />
91+
<ClCompile Include="..\src\handlers\stringtable.cpp" />
10392
</ItemGroup>
104-
10593
<ItemGroup>
106-
<ClInclude Include="..\include\types.hpp">
107-
<Filter>include</Filter>
108-
</ClInclude>
109-
<ClInclude Include="..\include\util.hpp">
94+
<ClInclude Include="..\src\include\types.hpp">
11095
<Filter>include</Filter>
11196
</ClInclude>
112-
<ClInclude Include="..\include\loc.hpp">
97+
<ClInclude Include="..\src\include\util.hpp">
11398
<Filter>include</Filter>
11499
</ClInclude>
115-
<ClInclude Include="..\include\binary_io.hpp">
100+
<ClInclude Include="..\src\include\binary_io.hpp">
116101
<Filter>include</Filter>
117102
</ClInclude>
118-
<ClInclude Include="..\include\compression.hpp">
103+
<ClInclude Include="..\src\include\compression.hpp">
119104
<Filter>include</Filter>
120105
</ClInclude>
121-
<ClInclude Include="..\include\assets.hpp">
106+
<ClInclude Include="..\src\include\assets.hpp">
122107
<Filter>include</Filter>
123108
</ClInclude>
124-
<ClInclude Include="..\include\miniz.h">
109+
<ClInclude Include="..\src\include\miniz.h">
125110
<Filter>include</Filter>
126111
</ClInclude>
127112
</ItemGroup>
128-
129113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
130114
<ImportGroup Label="ExtensionTargets">
131115
</ImportGroup>
132-
</Project>
116+
</Project>

‎build/unlinker.vcxproj.filters‎

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,37 +2,46 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="..\src\unlinker.cpp" />
5-
<ClCompile Include="..\include\miniz.c">
5+
<ClCompile Include="..\src\assets.cpp" />
6+
<ClCompile Include="..\src\handlers\localize.cpp">
7+
<Filter>handlers</Filter>
8+
</ClCompile>
9+
<ClCompile Include="..\src\handlers\rawfile.cpp">
10+
<Filter>handlers</Filter>
11+
</ClCompile>
12+
<ClCompile Include="..\src\handlers\stringtable.cpp">
13+
<Filter>handlers</Filter>
14+
</ClCompile>
15+
<ClCompile Include="..\src\include\miniz.c">
616
<Filter>include</Filter>
717
</ClCompile>
8-
<ClCompile Include="..\src\assets.cpp" />
918
</ItemGroup>
1019
<ItemGroup>
11-
<ClInclude Include="..\include\binary_io.hpp">
12-
<Filter>include</Filter>
13-
</ClInclude>
14-
<ClInclude Include="..\include\compression.hpp">
20+
<ClInclude Include="..\src\include\util.hpp">
1521
<Filter>include</Filter>
1622
</ClInclude>
17-
<ClInclude Include="..\include\loc.hpp">
23+
<ClInclude Include="..\src\include\types.hpp">
1824
<Filter>include</Filter>
1925
</ClInclude>
20-
<ClInclude Include="..\include\miniz.h">
26+
<ClInclude Include="..\src\include\miniz.h">
2127
<Filter>include</Filter>
2228
</ClInclude>
23-
<ClInclude Include="..\include\types.hpp">
29+
<ClInclude Include="..\src\include\compression.hpp">
2430
<Filter>include</Filter>
2531
</ClInclude>
26-
<ClInclude Include="..\include\util.hpp">
32+
<ClInclude Include="..\src\include\binary_io.hpp">
2733
<Filter>include</Filter>
2834
</ClInclude>
29-
<ClInclude Include="..\include\assets.hpp">
35+
<ClInclude Include="..\src\include\assets.hpp">
3036
<Filter>include</Filter>
3137
</ClInclude>
3238
</ItemGroup>
3339
<ItemGroup>
3440
<Filter Include="include">
3541
<UniqueIdentifier>{3a8a9f01-8ac6-48a5-b2cf-eecb18a55586}</UniqueIdentifier>
3642
</Filter>
43+
<Filter Include="handlers">
44+
<UniqueIdentifier>{e4ea0fcb-805c-4aee-8d95-e51108148819}</UniqueIdentifier>
45+
</Filter>
3746
</ItemGroup>
3847
</Project>

0 commit comments

Comments
 (0)