Amebis/wxWidgets
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Simplify MSVC pragma for embedding application manifest

Browse Source 
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.
This commit is contained in:
PB
2022-04-29 16:15:17 +02:00
committed by Vadim Zeitlin
parent 1c65e88221
commit ed3b1c6ca3
1 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
include/wx/defs.h
View File

@@ -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 */