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

Add MSW manifests for ARM and ARM64 platforms

Browse Source 
Closes https://github.com/wxWidgets/wxWidgets/pull/1657
This commit is contained in:
GH Cao
2019-11-21 00:55:02 +08:00
committed by Vadim Zeitlin
parent 2bc6e50ede
commit c0c2260944
5 changed files with 58 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
include/wx/msw/arm.manifest Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.64.1.0"
processorArchitecture="arm"
name="Controls"
type="win32"
/>
<description>wxWindows application</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="arm"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly>

22
include/wx/msw/arm64.manifest Normal file
View File

@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity
version="0.64.1.0"
processorArchitecture="arm64"
name="Controls"
type="win32"
/>
<description>wxWindows application</description>
<dependency>
<dependentAssembly>
<assemblyIdentity
type="win32"
name="Microsoft.Windows.Common-Controls"
version="6.0.0.0"
processorArchitecture="arm64"
publicKeyToken="6595b64144ccf1df"
language="*"
/>
</dependentAssembly>
</dependency>
</assembly>

4
include/wx/msw/genrcdefs.h
View File

@@ -23,11 +23,11 @@ EMIT(#define wxUSE_RC_MANIFEST 1)
EMIT(#define WX_CPU_AMD64) EMIT(#define WX_CPU_AMD64)
#endif #endif
#ifdef _M_ARM #if defined _M_ARM || defined __arm__
EMIT(#define WX_CPU_ARM) EMIT(#define WX_CPU_ARM)
#endif #endif
#ifdef _M_ARM64 #if defined _M_ARM64 || defined __aarch64__
EMIT(#define WX_CPU_ARM64) EMIT(#define WX_CPU_ARM64)
#endif #endif

8
include/wx/msw/rcdefs.h
View File

@@ -31,6 +31,14 @@
#ifndef WX_CPU_IA64 #ifndef WX_CPU_IA64
#define WX_CPU_IA64 #define WX_CPU_IA64
#endif #endif
#elif defined __arm__
#ifndef WX_CPU_ARM
#define WX_CPU_ARM
#endif
#elif defined __aarch64__
#ifndef WX_CPU_ARM64
#define WX_CPU_ARM64
#endif
#endif #endif
#endif #endif

4
include/wx/msw/wx.rc
View File

@@ -111,6 +111,10 @@ wxBITMAP_STD_COLOURS BITMAP "wx/msw/colours.bmp"
#define wxMANIFEST_CPU "ia64" #define wxMANIFEST_CPU "ia64"
#elif defined(WX_CPU_X86) #elif defined(WX_CPU_X86)
#define wxMANIFEST_CPU "wx" #define wxMANIFEST_CPU "wx"
#elif defined(WX_CPU_ARM)
#define wxMANIFEST_CPU "arm"
#elif defined(WX_CPU_ARM64)
#define wxMANIFEST_CPU "arm64"
#else #else
// Notice that if the manifest is included, WX_CPU_XXX constant corresponding // Notice that if the manifest is included, WX_CPU_XXX constant corresponding
// to the architecture we're compiling for must be defined. This can be done // to the architecture we're compiling for must be defined. This can be done