From ed3b1c6ca3b68097a2cd1449516dde2a41f70dee Mon Sep 17 00:00:00 2001 From: PB Date: Fri, 29 Apr 2022 16:15:17 +0200 Subject: [PATCH] Simplify MSVC pragma for embedding application manifest Instead of defining a manifest for each individual CPU architecture, use a single manifest with an asterisk for the architecture. Should have been part of 77d8926126 (Simplify Windows application manifests, 2021-12-17). Closes #22376. --- include/wx/defs.h | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/include/wx/defs.h b/include/wx/defs.h index 241b8991f0..a6f65574c7 100644 --- a/include/wx/defs.h +++ b/include/wx/defs.h @@ -3210,25 +3210,15 @@ typedef const void* WXWidget; (!defined wxUSE_NO_MANIFEST || wxUSE_NO_MANIFEST == 0 ) && \ ( defined _MSC_FULL_VER && _MSC_FULL_VER >= 140040130 ) -#define WX_CC_MANIFEST(cpu) \ +#define WX_CC_MANIFEST \ "/manifestdependency:\"type='win32' \ name='Microsoft.Windows.Common-Controls' \ version='6.0.0.0' \ - processorArchitecture='" cpu "' \ + processorArchitecture='*' \ publicKeyToken='6595b64144ccf1df' \ language='*'\"" -#if defined _M_IX86 - #pragma comment(linker, WX_CC_MANIFEST("x86")) -#elif defined _M_X64 - #pragma comment(linker, WX_CC_MANIFEST("amd64")) -#elif defined _M_ARM64 - #pragma comment(linker, WX_CC_MANIFEST("arm64")) -#elif defined _M_IA64 - #pragma comment(linker, WX_CC_MANIFEST("ia64")) -#else - #pragma comment(linker, WX_CC_MANIFEST("*")) -#endif +#pragma comment(linker, WX_CC_MANIFEST) #endif /* !wxUSE_NO_MANIFEST && _MSC_FULL_VER >= 140040130 */