Skip to content

Commit c9b6425

Browse files
mateusfavarinmateusfavarin
authored
Merge pull request #187 from mateusfavarin/main
Update launcher build
2 parents 9b68a7d + 378de45 commit c9b6425

21 files changed

+19810
-52
lines changed

‎.gitmodules‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,3 @@
2626
path = externals/cpp-httplib
2727
url = https://github.com/yhirose/cpp-httplib
2828

29-
[submodule "externals/xdelta"]
30-
path = externals/xdelta
31-
url = https://github.com/jmacd/xdelta

‎externals/xdelta‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎tools/Launcher/Launcher.sln‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -5,57 +5,22 @@ VisualStudioVersion = 17.10.35027.167
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Launcher", "Launcher.vcxproj", "{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdelta3", "..\..\externals\xdelta\xdelta3\xdelta3.vcxproj", "{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) = preSolution
12-
Debug|Itanium = Debug|Itanium
1310
Debug|x64 = Debug|x64
1411
Debug|x86 = Debug|x86
15-
Release|Itanium = Release|Itanium
1612
Release|x64 = Release|x64
1713
Release|x86 = Release|x86
18-
xdelta3-64|Itanium = xdelta3-64|Itanium
19-
xdelta3-64|x64 = xdelta3-64|x64
20-
xdelta3-64|x86 = xdelta3-64|x86
2114
EndGlobalSection
2215
GlobalSection(ProjectConfigurationPlatforms) = postSolution
23-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|Itanium.ActiveCfg = Debug|x64
24-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|Itanium.Build.0 = Debug|x64
2516
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x64.ActiveCfg = Debug|x64
2617
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x64.Build.0 = Debug|x64
2718
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x86.ActiveCfg = Debug|Win32
2819
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x86.Build.0 = Debug|Win32
29-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|Itanium.ActiveCfg = Release|x64
30-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|Itanium.Build.0 = Release|x64
3120
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x64.ActiveCfg = Release|x64
3221
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x64.Build.0 = Release|x64
3322
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x86.ActiveCfg = Release|Win32
3423
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x86.Build.0 = Release|Win32
35-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|Itanium.ActiveCfg = Release|x64
36-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|Itanium.Build.0 = Release|x64
37-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x64.ActiveCfg = Release|x64
38-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x64.Build.0 = Release|x64
39-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x86.ActiveCfg = Release|Win32
40-
{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x86.Build.0 = Release|Win32
41-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|Itanium.ActiveCfg = Debug|Itanium
42-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|Itanium.Build.0 = Debug|Itanium
43-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x64.ActiveCfg = Debug|x64
44-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x64.Build.0 = Debug|x64
45-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x86.ActiveCfg = Debug|Win32
46-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x86.Build.0 = Debug|Win32
47-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|Itanium.ActiveCfg = Release|Itanium
48-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|Itanium.Build.0 = Release|Itanium
49-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x64.ActiveCfg = Release|x64
50-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x64.Build.0 = Release|x64
51-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x86.ActiveCfg = Release|Win32
52-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x86.Build.0 = Release|Win32
53-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|Itanium.ActiveCfg = xdelta3-64|Itanium
54-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|Itanium.Build.0 = xdelta3-64|Itanium
55-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x64.ActiveCfg = xdelta3-64|x64
56-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x64.Build.0 = xdelta3-64|x64
57-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x86.ActiveCfg = xdelta3-64|Win32
58-
{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x86.Build.0 = xdelta3-64|Win32
5924
EndGlobalSection
6025
GlobalSection(SolutionProperties) = preSolution
6126
HideSolutionNode = FALSE

‎tools/Launcher/Launcher.vcxproj‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,16 +102,19 @@
102102
<ClCompile>
103103
<WarningLevel>Level3</WarningLevel>
104104
<SDLCheck>true</SDLCheck>
105-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
105+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SIZEOF_SIZE_T=8;SIZEOF_UNSIGNED_LONG_LONG=8;XD3_MAIN=0;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=0;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=0;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
106106
<ConformanceMode>true</ConformanceMode>
107-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\externals\imgui\;$(ProjectDir)..\..\externals\json\include\;$(ProjectDir)..\..\externals\portable-file-dialogs\;$(ProjectDir)..\..\externals\cpp-httplib\;$(ProjectDir)third_party\OpenSSL\3.3.1\include\;$(ProjectDir)..\..\externals\xdelta\xdelta3\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
107+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\externals\imgui\;$(ProjectDir)..\..\externals\json\include\;$(ProjectDir)..\..\externals\portable-file-dialogs\;$(ProjectDir)..\..\externals\cpp-httplib\;$(ProjectDir)third_party\OpenSSL\3.3.1\include\;$(ProjectDir)third_party\xdelta3\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
108108
<LanguageStandard>stdcpp20</LanguageStandard>
109109
<LanguageStandard_C>stdc17</LanguageStandard_C>
110110
</ClCompile>
111111
<Link>
112112
<SubSystem>Console</SubSystem>
113113
<GenerateDebugInformation>true</GenerateDebugInformation>
114114
<AdditionalDependencies>opengl32.lib;Ws2_32.lib;$(SolutionDir)third_party\OpenSSL\3.3.1\lib\libssl_static.lib;$(SolutionDir)third_party\OpenSSL\3.3.1\lib\libcrypto_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<IgnoreSpecificDefaultLibraries>
116+
</IgnoreSpecificDefaultLibraries>
117+
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
115118
</Link>
116119
</ItemDefinitionGroup>
117120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -120,9 +123,9 @@
120123
<FunctionLevelLinking>true</FunctionLevelLinking>
121124
<IntrinsicFunctions>true</IntrinsicFunctions>
122125
<SDLCheck>true</SDLCheck>
123-
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
126+
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;SIZEOF_SIZE_T=8;SIZEOF_UNSIGNED_LONG_LONG=8;XD3_MAIN=0;XD3_DEBUG=0;XD3_USE_LARGEFILE64=1;REGRESSION_TEST=0;SECONDARY_DJW=1;SECONDARY_FGK=1;SECONDARY_LZMA=0;XD3_WIN32=1;EXTERNAL_COMPRESSION=0;SHELL_TESTS=0;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
124127
<ConformanceMode>true</ConformanceMode>
125-
<AdditionalIncludeDirectories>$(ProjectDir)..\..\externals\imgui\;$(ProjectDir)..\..\externals\json\include\;$(ProjectDir)..\..\externals\portable-file-dialogs\;$(ProjectDir)..\..\externals\cpp-httplib\;$(ProjectDir)third_party\OpenSSL\3.3.1\include\;$(ProjectDir)..\..\externals\xdelta\xdelta3\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
128+
<AdditionalIncludeDirectories>$(ProjectDir)..\..\externals\imgui\;$(ProjectDir)..\..\externals\json\include\;$(ProjectDir)..\..\externals\portable-file-dialogs\;$(ProjectDir)..\..\externals\cpp-httplib\;$(ProjectDir)third_party\OpenSSL\3.3.1\include\;$(ProjectDir)third_party\xdelta3\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
126129
<LanguageStandard>stdcpp20</LanguageStandard>
127130
<LanguageStandard_C>stdc17</LanguageStandard_C>
128131
</ClCompile>
@@ -132,6 +135,9 @@
132135
<OptimizeReferences>true</OptimizeReferences>
133136
<GenerateDebugInformation>true</GenerateDebugInformation>
134137
<AdditionalDependencies>opengl32.lib;Ws2_32.lib;$(SolutionDir)third_party\OpenSSL\3.3.1\lib\libssl_static.lib;$(SolutionDir)third_party\OpenSSL\3.3.1\lib\libcrypto_static.lib;%(AdditionalDependencies)</AdditionalDependencies>
138+
<IgnoreSpecificDefaultLibraries>
139+
</IgnoreSpecificDefaultLibraries>
140+
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
135141
</Link>
136142
</ItemDefinitionGroup>
137143
<ItemGroup>
@@ -149,11 +155,9 @@
149155
<ClCompile Include="main.cpp" />
150156
<ClCompile Include="patch.cpp" />
151157
<ClCompile Include="requests.cpp" />
158+
<ClCompile Include="third_party\xdelta3\xdelta3.c" />
152159
<ClCompile Include="ui.cpp" />
153160
</ItemGroup>
154-
<ItemGroup>
155-
<None Include="packages.config" />
156-
</ItemGroup>
157161
<ItemGroup>
158162
<ClInclude Include="app.h" />
159163
<ClInclude Include="dataManager.h" />
@@ -164,9 +168,7 @@
164168
<ClInclude Include="ui.h" />
165169
</ItemGroup>
166170
<ItemGroup>
167-
<ProjectReference Include="..\..\externals\xdelta\xdelta3\xdelta3.vcxproj">
168-
<Project>{8f9d37b5-b78e-4816-be61-aef679dbf3bc}</Project>
169-
</ProjectReference>
171+
<None Include="packages.config" />
170172
</ItemGroup>
171173
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
172174
<ImportGroup Label="ExtensionTargets">

‎tools/Launcher/Launcher.vcxproj.filters‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
<Filter Include="ImGui\misc">
2323
<UniqueIdentifier>{622648ac-38c0-4c8a-b926-b1ac16c0ffc3}</UniqueIdentifier>
2424
</Filter>
25+
<Filter Include="xdelta3">
26+
<UniqueIdentifier>{a5ac9002-c6a1-46a7-9148-b92c30d3ea73}</UniqueIdentifier>
27+
</Filter>
2528
</ItemGroup>
2629
<ItemGroup>
2730
<ClCompile Include="main.cpp">
@@ -69,9 +72,9 @@
6972
<ClCompile Include="io.cpp">
7073
<Filter>Source Files</Filter>
7174
</ClCompile>
72-
</ItemGroup>
73-
<ItemGroup>
74-
<None Include="packages.config" />
75+
<ClCompile Include="third_party\xdelta3\xdelta3.c">
76+
<Filter>xdelta3</Filter>
77+
</ClCompile>
7578
</ItemGroup>
7679
<ItemGroup>
7780
<ClInclude Include="app.h">
@@ -96,4 +99,7 @@
9699
<Filter>Header Files</Filter>
97100
</ClInclude>
98101
</ItemGroup>
102+
<ItemGroup>
103+
<None Include="packages.config" />
104+
</ItemGroup>
99105
</Project>

‎tools/Launcher/patch.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ static bool DecompressFile(const std::string& path, const std::string& filename,
2323

2424
std::string newFilePath = path.substr(0, path.find(".")) + ext;
2525
IO::WriteBinaryFile(decompressedFile, newFilePath);
26+
return true;
2627
}
2728

2829
static bool DecompressXDelta(const std::string& xdeltaPath, const std::string& inputPath, const std::string& ext)

0 commit comments

Comments
 (0)