Merge pull request #187 from mateusfavarin/main

Update launcher build
CTR-tools · Jul 15, 2024 · c9b6425 · c9b6425
2 parents 9b68a7d + 378de45
commit c9b6425
Show file tree

Hide file tree

Showing 21 changed files with 19,810 additions and 52 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -26,6 +26,3 @@
 	path = externals/cpp-httplib
 	url = https://github.com/yhirose/cpp-httplib
 
-[submodule "externals/xdelta"]
-	path = externals/xdelta
-	url = https://github.com/jmacd/xdelta
diff --git a/externals/xdelta b/externals/xdelta
diff --git a/tools/Launcher/Launcher.sln b/tools/Launcher/Launcher.sln
@@ -5,57 +5,22 @@ VisualStudioVersion = 17.10.35027.167
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Launcher", "Launcher.vcxproj", "{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xdelta3", "..\..\externals\xdelta\xdelta3\xdelta3.vcxproj", "{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Itanium = Debug|Itanium
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|Itanium = Release|Itanium
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
-		xdelta3-64|Itanium = xdelta3-64|Itanium
-		xdelta3-64|x64 = xdelta3-64|x64
-		xdelta3-64|x86 = xdelta3-64|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|Itanium.ActiveCfg = Debug|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|Itanium.Build.0 = Debug|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x64.ActiveCfg = Debug|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x64.Build.0 = Debug|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x86.ActiveCfg = Debug|Win32
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Debug|x86.Build.0 = Debug|Win32
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|Itanium.ActiveCfg = Release|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|Itanium.Build.0 = Release|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x64.ActiveCfg = Release|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x64.Build.0 = Release|x64
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x86.ActiveCfg = Release|Win32
 		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.Release|x86.Build.0 = Release|Win32
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|Itanium.ActiveCfg = Release|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|Itanium.Build.0 = Release|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x64.ActiveCfg = Release|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x64.Build.0 = Release|x64
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x86.ActiveCfg = Release|Win32
-		{C95458D2-4CEB-455C-8B9C-D85F61AD0DB8}.xdelta3-64|x86.Build.0 = Release|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|Itanium.ActiveCfg = Debug|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|Itanium.Build.0 = Debug|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x64.ActiveCfg = Debug|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x64.Build.0 = Debug|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x86.ActiveCfg = Debug|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Debug|x86.Build.0 = Debug|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|Itanium.ActiveCfg = Release|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|Itanium.Build.0 = Release|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x64.ActiveCfg = Release|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x64.Build.0 = Release|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x86.ActiveCfg = Release|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.Release|x86.Build.0 = Release|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|Itanium.ActiveCfg = xdelta3-64|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|Itanium.Build.0 = xdelta3-64|Itanium
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x64.ActiveCfg = xdelta3-64|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x64.Build.0 = xdelta3-64|x64
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x86.ActiveCfg = xdelta3-64|Win32
-		{8F9D37B5-B78E-4816-BE61-AEF679DBF3BC}.xdelta3-64|x86.Build.0 = xdelta3-64|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/tools/Launcher/Launcher.vcxproj b/tools/Launcher/Launcher.vcxproj
@@ -102,16 +102,19 @@
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
       <ConformanceMode>true</ConformanceMode>
-      <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>
+      <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>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <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>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -120,9 +123,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <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>
       <ConformanceMode>true</ConformanceMode>
-      <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>
+      <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>
       <LanguageStandard>stdcpp20</LanguageStandard>
       <LanguageStandard_C>stdc17</LanguageStandard_C>
     </ClCompile>
@@ -132,6 +135,9 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <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>
+      <IgnoreSpecificDefaultLibraries>
+      </IgnoreSpecificDefaultLibraries>
+      <AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -149,11 +155,9 @@
     <ClCompile Include="main.cpp" />
     <ClCompile Include="patch.cpp" />
     <ClCompile Include="requests.cpp" />
+    <ClCompile Include="third_party\xdelta3\xdelta3.c" />
     <ClCompile Include="ui.cpp" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="app.h" />
     <ClInclude Include="dataManager.h" />
@@ -164,9 +168,7 @@
     <ClInclude Include="ui.h" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\externals\xdelta\xdelta3\xdelta3.vcxproj">
-      <Project>{8f9d37b5-b78e-4816-be61-aef679dbf3bc}</Project>
-    </ProjectReference>
+    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

diff --git a/tools/Launcher/Launcher.vcxproj.filters b/tools/Launcher/Launcher.vcxproj.filters
@@ -22,6 +22,9 @@
     <Filter Include="ImGui\misc">
       <UniqueIdentifier>{622648ac-38c0-4c8a-b926-b1ac16c0ffc3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="xdelta3">
+      <UniqueIdentifier>{a5ac9002-c6a1-46a7-9148-b92c30d3ea73}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="main.cpp">
@@ -69,9 +72,9 @@
     <ClCompile Include="io.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
+    <ClCompile Include="third_party\xdelta3\xdelta3.c">
+      <Filter>xdelta3</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="app.h">
@@ -96,4 +99,7 @@
       <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
 </Project>
diff --git a/tools/Launcher/patch.cpp b/tools/Launcher/patch.cpp
@@ -23,6 +23,7 @@ static bool DecompressFile(const std::string& path, const std::string& filename,
 
   std::string newFilePath = path.substr(0, path.find(".")) + ext;
   IO::WriteBinaryFile(decompressedFile, newFilePath);
+  return true;
 }
 
 static bool DecompressXDelta(const std::string& xdeltaPath, const std::string& inputPath, const std::string& ext)