From 03552edbb7af8eae6e03f0c1aac7f30c9e4fe430 Mon Sep 17 00:00:00 2001
From: Lenny McLennington <lenny@sneed.church>
Date: Sat, 4 Feb 2023 15:28:16 +0000
Subject: [PATCH] Fix Windows Qt6 builds

- Fix warning about no return on main
- Fix program not starting when built with Qt6

Signed-off-by: Lenny McLennington <lenny@sneed.church>
---
 launcher/main.cpp               | 1 +
 program_info/polymc.manifest.in | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/launcher/main.cpp b/launcher/main.cpp
index 85fe1260..50d110c7 100644
--- a/launcher/main.cpp
+++ b/launcher/main.cpp
@@ -91,4 +91,5 @@ int main(int argc, char *argv[])
     case Application::Succeeded:
         return 0;
     }
+    return 0;
 }
diff --git a/program_info/polymc.manifest.in b/program_info/polymc.manifest.in
index b85b6d46..f13e5533 100644
--- a/program_info/polymc.manifest.in
+++ b/program_info/polymc.manifest.in
@@ -10,7 +10,7 @@
   </trustInfo>
   <dependency>
     <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*"/>
+      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/>
     </dependentAssembly>
   </dependency>
   <description>Custom Minecraft launcher for managing multiple installs.</description>