From 8ff24415d2c136ff44178fd65038fff731fdffd1 Mon Sep 17 00:00:00 2001
From: ThePixelGamer <keefjacob@gmail.com>
Date: Fri, 25 Mar 2022 05:41:17 -0500
Subject: [PATCH] Cleanup Solution and Project files

This commit adds arm "support" and tries to reduce duplications in the project files.
It also reverse the change 194cb6bda9125a424085dc6ffba9380adfeb5f91 made which made the launcher a 64-bit app (this is only necessary for the injector on 64-bit windows)
---
 ZenovaLauncher.sln                   |  14 ++-
 ZenovaLauncher/ZenovaLauncher.csproj |   4 +-
 ZenovaLoader/ZenovaLoader.vcxproj    | 129 ++++++++++++---------------
 3 files changed, 68 insertions(+), 79 deletions(-)

diff --git a/ZenovaLauncher.sln b/ZenovaLauncher.sln
index 32760cb..96e13bf 100644
--- a/ZenovaLauncher.sln
+++ b/ZenovaLauncher.sln
@@ -45,15 +45,21 @@ Global
 		{32C4B338-788C-48D1-A8F0-FE480D3AE5E5}.Release|x86.ActiveCfg = Release|Any CPU
 		{32C4B338-788C-48D1-A8F0-FE480D3AE5E5}.Release|x86.Build.0 = Release|Any CPU
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|Any CPU.ActiveCfg = Debug|Win32
-		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM.ActiveCfg = Debug|Win32
-		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM64.ActiveCfg = Debug|Win32
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|Any CPU.Build.0 = Debug|Win32
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM.ActiveCfg = Debug|ARM
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM.Build.0 = Debug|ARM
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM64.ActiveCfg = Debug|ARM64
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|ARM64.Build.0 = Debug|ARM64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|x64.ActiveCfg = Debug|x64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|x64.Build.0 = Debug|x64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|x86.ActiveCfg = Debug|Win32
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Debug|x86.Build.0 = Debug|Win32
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|Any CPU.ActiveCfg = Release|Win32
-		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM.ActiveCfg = Release|Win32
-		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM64.ActiveCfg = Release|Win32
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|Any CPU.Build.0 = Release|Win32
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM.ActiveCfg = Release|ARM
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM.Build.0 = Release|ARM
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM64.ActiveCfg = Release|ARM64
+		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|ARM64.Build.0 = Release|ARM64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|x64.ActiveCfg = Release|x64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|x64.Build.0 = Release|x64
 		{167B4E2C-FEC6-4789-9558-E0B7C79D55C1}.Release|x86.ActiveCfg = Release|Win32
diff --git a/ZenovaLauncher/ZenovaLauncher.csproj b/ZenovaLauncher/ZenovaLauncher.csproj
index cfd2cb0..3371ac0 100644
--- a/ZenovaLauncher/ZenovaLauncher.csproj
+++ b/ZenovaLauncher/ZenovaLauncher.csproj
@@ -18,7 +18,7 @@
     </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
@@ -28,7 +28,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
diff --git a/ZenovaLoader/ZenovaLoader.vcxproj b/ZenovaLoader/ZenovaLoader.vcxproj
index d24ac90..0253f30 100644
--- a/ZenovaLoader/ZenovaLoader.vcxproj
+++ b/ZenovaLoader/ZenovaLoader.vcxproj
@@ -1,10 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
@@ -59,57 +75,20 @@
   </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'">
+  <ImportGroup Label="PropertySheets">
     <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)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
-    <TargetExt />
-    <IntDir>$(Platform)\$(Configuration)\</IntDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <PropertyGroup>
     <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
-    <TargetExt />
     <IntDir>$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
-    <TargetExt />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <OutDir>$(SolutionDir)ZenovaLauncher\bin\$(Configuration)\</OutDir>
-    <TargetExt />
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <VcpkgUseStatic>true</VcpkgUseStatic>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <VcpkgUseStatic>true</VcpkgUseStatic>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <VcpkgUseStatic>true</VcpkgUseStatic>
-  </PropertyGroup>
-  <PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <VcpkgUseStatic>true</VcpkgUseStatic>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+  <ItemDefinitionGroup>
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -117,58 +96,62 @@
       <OutputFile>$(OutDir)$(TargetName)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
-      <SubSystem>Windows</SubSystem>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <ClCompile>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <!-- Unsure how to handle Preprocessor Definitions for Arm targets so I'm leaving the defaults alone -->
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)</OutputFile>
-    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <ClCompile>
+      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <LanguageStandard>stdcpp17</LanguageStandard>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
-    <Link>
-      <SubSystem>Windows</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>$(OutDir)$(TargetName)</OutputFile>
-    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <ClCompile>
+      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
   </ItemDefinitionGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">