From b20bfb2ae820fe74c40be5c8a8316478d3a296fa Mon Sep 17 00:00:00 2001
From: Marek Roszko <mark.roszko@gmail.com>
Date: Mon, 10 Apr 2023 20:30:38 -0400
Subject: [PATCH] Remove arch specific manifests
I copied it from wxWidgets originally in a rush but we can just wildcard the processor arch
---
resources/msw/kiwin32.rc | 8 ++--
.../{x86.manifest => basic.manifest} | 6 +--
..._pmv2.manifest => dpi_aware_pmv2.manifest} | 19 +++++++--
resources/msw/manifests/x64.manifest | 41 -------------------
.../msw/manifests/x86_dpi_aware_pmv2.manifest | 37 -----------------
5 files changed, 23 insertions(+), 88 deletions(-)
rename resources/msw/manifests/{x86.manifest => basic.manifest} (93%)
rename resources/msw/manifests/{x64_dpi_aware_pmv2.manifest => dpi_aware_pmv2.manifest} (78%)
delete mode 100644 resources/msw/manifests/x64.manifest
delete mode 100644 resources/msw/manifests/x86_dpi_aware_pmv2.manifest
diff --git a/resources/msw/kiwin32.rc b/resources/msw/kiwin32.rc
index 6337aeb510..e2968355ca 100644
--- a/resources/msw/kiwin32.rc
+++ b/resources/msw/kiwin32.rc
@@ -12,9 +12,9 @@
#endif
#if !defined( KICAD_WIN32_DPI_AWARE ) || KICAD_WIN32_DPI_AWARE == 0
-#define MANIFEST_SUFFIX .manifest
+#define MANIFEST_NAME basic.manifest
#else
-#define MANIFEST_SUFFIX _dpi_aware_pmv2.manifest
+#define MANIFEST_NAME dpi_aware_pmv2.manifest
#endif
//MSYS2
@@ -25,10 +25,10 @@
#define RC_CONCAT2( a, b, c ) a##b##c
#ifdef __GNUC__
-#define MANIFEST_FILE "manifests/" RC_STR( KICAD_BUILD_ARCH ) RC_STR( MANIFEST_SUFFIX )
+#define MANIFEST_FILE "manifests/" RC_STR( MANIFEST_NAME )
#else
//Do not try and quote the first part, it won't work, also make sure the IDE doesn't reformat it with spaces between slashes
-#define MANIFEST_FILE RC_CONCAT( manifests/, KICAD_BUILD_ARCH, MANIFEST_SUFFIX )
+#define MANIFEST_FILE RC_CONCAT( manifests/, MANIFEST_NAME )
#endif
MANIFEST_ID RT_MANIFEST MANIFEST_FILE
diff --git a/resources/msw/manifests/x86.manifest b/resources/msw/manifests/basic.manifest
similarity index 93%
rename from resources/msw/manifests/x86.manifest
rename to resources/msw/manifests/basic.manifest
index 2c8b801f87..ec48241fc5 100644
--- a/resources/msw/manifests/x86.manifest
+++ b/resources/msw/manifests/basic.manifest
@@ -2,8 +2,8 @@
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
<assemblyIdentity
version="0.64.1.0"
- processorArchitecture="x86"
- name="Controls"
+ processorArchitecture="*"
+ name="KiCad"
type="win32"
/>
<dependency>
@@ -12,7 +12,7 @@
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
- processorArchitecture="X86"
+ processorArchitecture="*"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
diff --git a/resources/msw/manifests/x64_dpi_aware_pmv2.manifest b/resources/msw/manifests/dpi_aware_pmv2.manifest
similarity index 78%
rename from resources/msw/manifests/x64_dpi_aware_pmv2.manifest
rename to resources/msw/manifests/dpi_aware_pmv2.manifest
index 34e0ffc8e9..acf8331bba 100644
--- a/resources/msw/manifests/x64_dpi_aware_pmv2.manifest
+++ b/resources/msw/manifests/dpi_aware_pmv2.manifest
@@ -1,9 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
+ <assemblyIdentity
+ version="0.64.1.0"
+ processorArchitecture="*"
+ name="KiCad"
+ type="win32"
+ />
<dependency>
- <dependentAssembly>
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="amd64" publicKeyToken="6595b64144ccf1df" language="*" />
- </dependentAssembly>
+ <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>
diff --git a/resources/msw/manifests/x64.manifest b/resources/msw/manifests/x64.manifest
deleted file mode 100644
index a5f27f64b9..0000000000
--- a/resources/msw/manifests/x64.manifest
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <assemblyIdentity
- version="0.64.1.0"
- processorArchitecture="amd64"
- name="Controls"
- type="win32"
- />
- <dependency>
- <dependentAssembly>
- <assemblyIdentity
- type="win32"
- name="Microsoft.Windows.Common-Controls"
- version="6.0.0.0"
- processorArchitecture="amd64"
- publicKeyToken="6595b64144ccf1df"
- language="*"
- />
- </dependentAssembly>
- </dependency>
- <asmv3:application>
- <asmv3:windowsSettings>
- <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
- <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
- </asmv3:windowsSettings>
- </asmv3:application>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
- <!-- Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
- <!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
- <!-- Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
- <!-- Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
- </application>
- </compatibility>
-</assembly>
\ No newline at end of file
diff --git a/resources/msw/manifests/x86_dpi_aware_pmv2.manifest b/resources/msw/manifests/x86_dpi_aware_pmv2.manifest
deleted file mode 100644
index 8c2d961862..0000000000
--- a/resources/msw/manifests/x86_dpi_aware_pmv2.manifest
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="x86" publicKeyToken="6595b64144ccf1df" language="*" />
- </dependentAssembly>
- </dependency>
- <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
- <security>
- <requestedPrivileges>
- <requestedExecutionLevel level="asInvoker" uiAccess="false" />
- </requestedPrivileges>
- </security>
- </trustInfo>
- <asmv3:application>
- <asmv3:windowsSettings>
- <activeCodePage xmlns="http://schemas.microsoft.com/SMI/2019/WindowsSettings">UTF-8</activeCodePage>
- <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2, system</dpiAwareness>
- <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
- <longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
- </asmv3:windowsSettings>
- </asmv3:application>
- <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
- <application>
- <!-- Windows Vista -->
- <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}" />
- <!-- Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
- <!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
- <!-- Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
- <!-- Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
- </application>
- </compatibility>
-</assembly>
\ No newline at end of file