Windows: Enable v6 Common Control support in the manifest

Warzone2100 · Dec 22, 2019 · 9c2a5fc · 9c2a5fc
1 parent 05ba4ca
commit 9c2a5fc
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/win32/warzone2100.manifest b/win32/warzone2100.manifest
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 	<assemblyIdentity type="win32" name="Warzone2100Project.Warzone2100" version="1.0.0.0"/>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity
+				type="win32"
+				name="Microsoft.Windows.Common-Controls"
+				version="6.0.0.0"
+				processorArchitecture="*"
+				publicKeyToken="6595b64144ccf1df"
+				language="*"
+			/>
+		</dependentAssembly>
+	</dependency>
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<!-- Do not require administrator privileges to run -->
@@ -26,7 +38,7 @@
 			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
 			<!-- Windows 8.1 -->
 			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<!-- Windows 10 -->
+			<!-- Windows 10 -->
 			<!-- NOTE: This is commented out to avoid an issue loading OpenGL drivers for old Intel chipsets on Windows 10. -->
 			<!-- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> -->
 		</application>

diff --git a/win32/warzone2100.manifest.in b/win32/warzone2100.manifest.in
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 	<assemblyIdentity type="win32" name="Warzone2100Project.Warzone2100" version="@MANIFEST_assemblyIdentityVersion@"/>
+	<dependency>
+		<dependentAssembly>
+			<assemblyIdentity
+				type="win32"
+				name="Microsoft.Windows.Common-Controls"
+				version="6.0.0.0"
+				processorArchitecture="*"
+				publicKeyToken="6595b64144ccf1df"
+				language="*"
+			/>
+		</dependentAssembly>
+	</dependency>
 	<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
 		<security>
 			<!-- Do not require administrator privileges to run -->
@@ -26,8 +38,8 @@
 			<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
 			<!-- Windows 8.1 -->
 			<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-			<!-- Windows 10 -->
-			<!-- NOTE: This is commented out to avoid an issue loading OpenGL drivers for old Intel chipsets on Windows 10. -->
+			<!-- Windows 10 -->
+			<!-- NOTE: This is commented out to avoid an issue loading OpenGL drivers for old Intel chipsets on Windows 10. -->
 			<!-- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> -->
 		</application>
 	</compatibility>