Introduce MSW ARM64 support

This is a preliminary ARM64 platform support for wxWidgets at "it
compiles" stage. This will allow building and testing wxWidgets based
apps for oncoming Windows 10 ARM64.

Requirements:
- Visual Studio 2017 Update 4 or later with Visual C++ compilers and
  libraries for ARM64 component installed

Building:
1. Open command prompt.
2. Change directory to build\msw subfolder.
3. Run "C:\Program Files (x86)\Microsoft Visual
   Studio\2017\Community\VC\Auxiliary\Build\vcvarsamd64_arm64.bat" once.
4. Use `nmake TARGET_CPU=ARM64 ...` to build required flavor of wxWidget
   libraries.

Notes:
1. Building of *.sln/*.vcxproj files does not support ARM64 yet. This
   requires to hardcode Windows SDK to 10.0.15063.0 or later in
   *.vcxproj files, which would render them non-compilable in older
   Visual Studio versions. Microsoft is aware of this issue and is
   planning a fix in the next version of Visual Studio.
2. wxmsw31ud_gl.dll does not build yet. Awaiting Microsoft to deliver
   missing opengl32.lib for ARM64. Please, specify USE_OPENGL=0.

Closes https://github.com/wxWidgets/wxWidgets/pull/923

.gitignore

@@ -28,32 +28,46 @@
 /build/msw/makefile.dmc
 /build/msw/*c*_msw
 /build/msw/*c*_msw_x64
+/build/msw/*c*_msw_arm64
 /build/msw/*c*_msw[du]
 /build/msw/*c*_msw[du]_x64
+/build/msw/*c*_msw[du]_arm64
 /build/msw/*c*_mswud
 /build/msw/*c*_mswud_x64
+/build/msw/*c*_mswud_arm64
 /build/msw/*c*_mswdll
 /build/msw/*c*_mswdll_x64
+/build/msw/*c*_mswdll_arm64
 /build/msw/*c*_msw[du]dll
 /build/msw/*c*_msw[du]dll_x64
+/build/msw/*c*_msw[du]dll_arm64
 /build/msw/*c*_mswuddll
 /build/msw/*c*_mswuddll_x64
+/build/msw/*c*_mswuddll_arm64
 /build/msw/*c*_mswuniv
 /build/msw/*c*_mswuniv_x64
+/build/msw/*c*_mswuniv_arm64
 /build/msw/*c*_mswuniv[du]
 /build/msw/*c*_mswuniv[du]_x64
+/build/msw/*c*_mswuniv[du]_arm64
 /build/msw/*c*_mswunivud
 /build/msw/*c*_mswunivud_x64
+/build/msw/*c*_mswunivud_arm64
 /build/msw/*c*_mswunivdll
 /build/msw/*c*_mswunivdll_x64
+/build/msw/*c*_mswunivdll_arm64
 /build/msw/*c*_mswuniv[du]dll
 /build/msw/*c*_mswuniv[du]dll_x64
+/build/msw/*c*_mswuniv[du]dll_arm64
 /build/msw/*c*_mswunivuddll
 /build/msw/*c*_mswunivuddll_x64
+/build/msw/*c*_mswunivuddll_arm64
 /build/msw/*c*_mswhdll
 /build/msw/*c*_mswhdll_x64
+/build/msw/*c*_mswhdll_arm64
 /build/msw/*c*_mswuhdll
 /build/msw/*c*_mswuhdll_x64
+/build/msw/*c*_mswuhdll_arm64
 /build/msw/wx_local.props
 
 /build/msw/*.vcproj.*.user
@@ -82,28 +96,40 @@
 /demos/*/*.sln
 /demos/*/*c*_msw
 /demos/*/*c*_msw_x64
+/demos/*/*c*_msw_arm64
 /demos/*/*c*_msw[du]
 /demos/*/*c*_msw[du]_x64
+/demos/*/*c*_msw[du]_arm64
 /demos/*/*c*_mswud
 /demos/*/*c*_mswud_x64
+/demos/*/*c*_mswud_arm64
 /demos/*/*c*_mswdll
 /demos/*/*c*_mswdll_x64
+/demos/*/*c*_mswdll_arm64
 /demos/*/*c*_msw[du]dll
 /demos/*/*c*_msw[du]dll_x64
+/demos/*/*c*_msw[du]dll_arm64
 /demos/*/*c*_mswuddll
 /demos/*/*c*_mswuddll_x64
+/demos/*/*c*_mswuddll_arm64
 /demos/*/*c*_mswuniv
 /demos/*/*c*_mswuniv_x64
+/demos/*/*c*_mswuniv_arm64
 /demos/*/*c*_mswuniv[du]
 /demos/*/*c*_mswuniv[du]_x64
+/demos/*/*c*_mswuniv[du]_arm64
 /demos/*/*c*_mswunivud
 /demos/*/*c*_mswunivud_x64
+/demos/*/*c*_mswunivud_arm64
 /demos/*/*c*_mswunivdll
 /demos/*/*c*_mswunivdll_x64
+/demos/*/*c*_mswunivdll_arm64
 /demos/*/*c*_mswuniv[du]dll
 /demos/*/*c*_mswuniv[du]dll_x64
+/demos/*/*c*_mswuniv[du]dll_arm64
 /demos/*/*c*_mswunivuddll
 /demos/*/*c*_mswunivuddll_x64
+/demos/*/*c*_mswunivuddll_arm64
 /demos/*/*Classic?Debug*
 /demos/*/*Classic?Release*
 /demos/*/*Carbon?Debug*
@@ -220,6 +246,8 @@
 /lib/vc*_lib
 /lib/vc*_x64_dll
 /lib/vc*_x64_lib
+/lib/vc*_arm64_dll
+/lib/vc*_arm64_lib
 /lib/wat_lib
 /lib/winmm32_sc.lib
 /lib/wsock32_sc.lib
@@ -276,28 +304,40 @@
 # /samples/
 /samples/**/*c*_msw
 /samples/**/*c*_msw_x64
+/samples/**/*c*_msw_arm64
 /samples/**/*c*_msw[du]
 /samples/**/*c*_msw[du]_x64
+/samples/**/*c*_msw[du]_arm64
 /samples/**/*c*_mswud
 /samples/**/*c*_mswud_x64
+/samples/**/*c*_mswud_arm64
 /samples/**/*c*_mswdll
 /samples/**/*c*_mswdll_x64
+/samples/**/*c*_mswdll_arm64
 /samples/**/*c*_msw[du]dll
 /samples/**/*c*_msw[du]dll_x64
+/samples/**/*c*_msw[du]dll_arm64
 /samples/**/*c*_mswuddll
 /samples/**/*c*_mswuddll_x64
+/samples/**/*c*_mswuddll_arm64
 /samples/**/*c*_mswuniv
 /samples/**/*c*_mswuniv_x64
+/samples/**/*c*_mswuniv_arm64
 /samples/**/*c*_mswuniv[du]
 /samples/**/*c*_mswuniv[du]_x64
+/samples/**/*c*_mswuniv[du]_arm64
 /samples/**/*c*_mswunivud
 /samples/**/*c*_mswunivud_x64
+/samples/**/*c*_mswunivud_arm64
 /samples/**/*c*_mswunivdll
 /samples/**/*c*_mswunivdll_x64
+/samples/**/*c*_mswunivdll_arm64
 /samples/**/*c*_mswuniv[du]dll
 /samples/**/*c*_mswuniv[du]dll_x64
+/samples/**/*c*_mswuniv[du]dll_arm64
 /samples/**/*c*_mswunivuddll
 /samples/**/*c*_mswunivuddll_x64
+/samples/**/*c*_mswunivuddll_arm64
 
 # /samples/image/
 /samples/image/saved.xpm
@@ -361,28 +401,40 @@
 # /tests/
 /tests/*c*_msw
 /tests/*c*_msw_x64
+/tests/*c*_msw_arm64
 /tests/*c*_msw[du]
 /tests/*c*_msw[du]_x64
+/tests/*c*_msw[du]_arm64
 /tests/*c*_mswud
 /tests/*c*_mswud_x64
+/tests/*c*_mswud_arm64
 /tests/*c*_mswdll
 /tests/*c*_mswdll_x64
+/tests/*c*_mswdll_arm64
 /tests/*c*_msw[du]dll
 /tests/*c*_msw[du]dll_x64
+/tests/*c*_msw[du]dll_arm64
 /tests/*c*_mswuddll
 /tests/*c*_mswuddll_x64
+/tests/*c*_mswuddll_arm64
 /tests/*c*_mswuniv
 /tests/*c*_mswuniv_x64
+/tests/*c*_mswuniv_arm64
 /tests/*c*_mswuniv[du]
 /tests/*c*_mswuniv[du]_x64
+/tests/*c*_mswuniv[du]_arm64
 /tests/*c*_mswunivud
 /tests/*c*_mswunivud_x64
+/tests/*c*_mswunivud_arm64
 /tests/*c*_mswunivdll
 /tests/*c*_mswunivdll_x64
+/tests/*c*_mswunivdll_arm64
 /tests/*c*_mswuniv[du]dll
 /tests/*c*_mswuniv[du]dll_x64
+/tests/*c*_mswuniv[du]dll_arm64
 /tests/*c*_mswunivuddll
 /tests/*c*_mswunivuddll_x64
+/tests/*c*_mswunivuddll_arm64
 /tests/test.opt
 /tests/test*.dsw
 /tests/test*.sln
@@ -396,12 +448,16 @@
 # /utils/
 /utils/**/*c*_mswu
 /utils/**/*c*_mswu_x64
+/utils/**/*c*_mswu_arm64
 /utils/**/*c*_mswud
 /utils/**/*c*_mswud_x64
+/utils/**/*c*_mswud_arm64
 /utils/**/*c*_mswudll
 /utils/**/*c*_mswudll_x64
+/utils/**/*c*_mswudll_arm64
 /utils/**/*c*_mswuddll
 /utils/**/*c*_mswuddll_x64
+/utils/**/*c*_mswuddll_arm64
 
 # /utils/emulator/src/
 /utils/emulator/src/*.sln

build/bakefiles/common.bkl

@@ -37,6 +37,8 @@
         <if cond="FORMAT=='msvs2008prj' and MSVS_PLATFORM=='win64'">_x64</if>
         <if cond="TARGET_CPU=='amd64'">_x64</if>
         <if cond="TARGET_CPU=='AMD64'">_x64</if>
+        <if cond="TARGET_CPU=='arm64'">_arm64</if>
+        <if cond="TARGET_CPU=='ARM64'">_arm64</if>
         <if cond="TARGET_CPU=='ia64'">_ia64</if>
         <if cond="TARGET_CPU=='IA64'">_ia64</if>
         <if cond="TARGET_CPU=='x64'">_x64</if>
@@ -314,6 +316,8 @@
     <set var="LINK_TARGET_CPU">
         <if cond="TARGET_CPU=='amd64'">/MACHINE:X64</if>
         <if cond="TARGET_CPU=='AMD64'">/MACHINE:X64</if>
+        <if cond="TARGET_CPU=='arm64'">/MACHINE:ARM64</if>
+        <if cond="TARGET_CPU=='ARM64'">/MACHINE:ARM64</if>
         <if cond="TARGET_CPU=='ia64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='IA64'">/MACHINE:IA64</if>
         <if cond="TARGET_CPU=='x64'">/MACHINE:X64</if>

build/bakefiles/config.bkl

@@ -128,7 +128,7 @@ your environment is set up appropriately with the correct compiler in the
 PATH. Rather it affects some options passed to some of the common build
 utilities such as the resource compiler and the linker.
 
-Accepted values: IA64, X64
+Accepted values: IA64, X64, ARM64
 (AMD64 accepted as synonym for X64 but should not be used any more).
             </description>
         </option>

build/msw/config.vc

@@ -52,7 +52,7 @@ BUILD = debug
 # PATH. Rather it affects some options passed to some of the common build
 # utilities such as the resource compiler and the linker.
 # 
-# Accepted values: IA64, X64
+# Accepted values: IA64, X64, ARM64
 # (AMD64 accepted as synonym for X64 but should not be used any more). 
 TARGET_CPU = $(CPU)
 

build/msw/makefile.vc

@@ -1783,6 +1783,9 @@ BUILD_CFG_FILE = $(SETUPHDIR)\build.cfg
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -1792,6 +1795,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -1843,6 +1849,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -1852,6 +1861,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

build/msw/wx_setup.props

@@ -16,6 +16,9 @@
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='x64'">
     <wxArchSuffix>_x64</wxArchSuffix>
   </PropertyGroup>
+  <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='ARM64'">
+    <wxArchSuffix>_arm64</wxArchSuffix>
+  </PropertyGroup>
   <PropertyGroup Label="UserMacros" Condition="'$(Platform)'=='Itanium'">
     <wxArchSuffix>_ia64</wxArchSuffix>
   </PropertyGroup>

demos/bombs/makefile.vc

@@ -42,6 +42,9 @@ BOMBS_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -51,6 +54,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -90,6 +96,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -99,6 +108,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

demos/forty/makefile.vc

@@ -47,6 +47,9 @@ FORTY_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -56,6 +59,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -95,6 +101,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -104,6 +113,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

demos/fractal/makefile.vc

@@ -40,6 +40,9 @@ FRACTAL_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

demos/life/makefile.vc

@@ -43,6 +43,9 @@ LIFE_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -52,6 +55,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -91,6 +97,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -100,6 +109,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

demos/poem/makefile.vc

@@ -40,6 +40,9 @@ WXPOEM_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

docs/changes.txt

@@ -125,8 +125,9 @@ wxGTK:
 
 wxMSW:
 
+- Add experimental support for Windows 10/ARM64 platform (Simon Rozman).
 - Fix hang after clearing wxTAB_TRAVERSAL style on a window with children.
-- Fix handling of AUX2 mouse button events (Trylz).
+- Fix handling of AUX2 mouse button events (Timon Rozmanrylz).
 - Fix saving/restoring window position for maximized windows.
 - Fix stack corruption when using wxStackWalker (srfisk).
 - Fix positioning windows at positions >= SHORT_MAX (Cătălin Răceanu).

docs/msw/install.txt

@@ -455,7 +455,7 @@ DEBUG_RUNTIME_LIBS=1
   usable .pdb files with debug information) and this setting makes it
   possible.
 
-TARGET_CPU=X64|IA64
+TARGET_CPU=X64|ARM64|IA64
   (VC++ only.) Set this variable to build for x86_64 systems. If unset, x86
   build is performed.
 

include/msvc/wx/setup.h

@@ -77,6 +77,8 @@
 // architecture-specific part: not used (again, for compatibility), for x86
 #if defined(_M_X64)
     #define wxARCH_SUFFIX _x64
+#elif defined(_M_ARM64)
+    #define wxARCH_SUFFIX _arm64
 #elif defined(_M_IA64)
     #define wxARCH_SUFFIX _ia64
 #else // assume _M_IX86

include/wx/defs.h

@@ -3033,6 +3033,8 @@ typedef const void* WXWidget;
     #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

include/wx/msw/debughlp.h

@@ -305,7 +305,7 @@ public:
     // suffix in some cases. These 2 helper macros call the macro with the
     // correct arguments in both cases.
     #define wxSYM_CALL(what, name)  what(name, name)
-#if defined(_M_AMD64)
+#if defined(_M_AMD64) || defined(_M_ARM64)
     #define wxSYM_CALL_64(what, name)  what(name, name ## 64)
 
     // Also undo all the "helpful" definitions done by imagehlp.h that map 32

include/wx/msw/genrcdefs.h

@@ -27,6 +27,10 @@ EMIT(#define WX_CPU_AMD64)
 EMIT(#define WX_CPU_ARM)
 #endif
 
+#ifdef _M_ARM64
+EMIT(#define WX_CPU_ARM64)
+#endif
+
 #if defined _M_IA64 || defined __ia64__
 EMIT(#define WX_CPU_IA64)
 #endif

samples/access/makefile.vc

@@ -40,6 +40,9 @@ ACCESSTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/animate/makefile.vc

@@ -40,6 +40,9 @@ ANITEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/archive/makefile.vc

@@ -38,6 +38,9 @@ ARCHIVE_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -47,6 +50,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -86,6 +92,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -95,6 +104,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/artprov/makefile.vc

@@ -41,6 +41,9 @@ ARTTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -50,6 +53,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -89,6 +95,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -98,6 +107,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/aui/makefile.vc

@@ -40,6 +40,9 @@ AUIDEMO_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/calendar/makefile.vc

@@ -40,6 +40,9 @@ CALENDAR_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/caret/makefile.vc

@@ -40,6 +40,9 @@ CARET_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/clipboard/makefile.vc

@@ -40,6 +40,9 @@ CLIPBOARD_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/collpane/makefile.vc

@@ -40,6 +40,9 @@ COLLPANE_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/combo/makefile.vc

@@ -40,6 +40,9 @@ COMBO_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/config/makefile.vc

@@ -40,6 +40,9 @@ CONFTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/console/makefile.vc

@@ -38,6 +38,9 @@ CONSOLE_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -47,6 +50,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -86,6 +92,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -95,6 +104,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dataview/makefile.vc

@@ -41,6 +41,9 @@ DATAVIEW_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -50,6 +53,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -89,6 +95,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -98,6 +107,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/debugrpt/makefile.vc

@@ -40,6 +40,9 @@ DEBUGRPT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dialogs/makefile.vc

@@ -41,6 +41,9 @@ DIALOGS_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -50,6 +53,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -89,6 +95,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -98,6 +107,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dialup/makefile.vc

@@ -40,6 +40,9 @@ NETTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/display/makefile.vc

@@ -40,6 +40,9 @@ DISPLAY_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dll/makefile.vc

@@ -59,6 +59,9 @@ SDK_EXE_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -68,6 +71,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -107,6 +113,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dnd/makefile.vc

@@ -40,6 +40,9 @@ DND_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/docview/makefile.vc

@@ -42,6 +42,9 @@ DOCVIEW_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -51,6 +54,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -90,6 +96,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -99,6 +108,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/dragimag/makefile.vc

@@ -40,6 +40,9 @@ DRAGIMAG_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/drawing/makefile.vc

@@ -40,6 +40,9 @@ DRAWING_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/erase/makefile.vc

@@ -40,6 +40,9 @@ ERASE_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/event/makefile.vc

@@ -41,6 +41,9 @@ EVENT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -50,6 +53,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -89,6 +95,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -98,6 +107,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/except/makefile.vc

@@ -40,6 +40,9 @@ EXCEPT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/exec/makefile.vc

@@ -40,6 +40,9 @@ EXEC_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/flash/makefile.vc

@@ -40,6 +40,9 @@ FLASH_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/font/makefile.vc

@@ -40,6 +40,9 @@ FONT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/fswatcher/makefile.vc

@@ -40,6 +40,9 @@ FSWATCHER_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/grid/makefile.vc

@@ -40,6 +40,9 @@ GRID_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/help/makefile.vc

@@ -40,6 +40,9 @@ HELP_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/htlbox/makefile.vc

@@ -40,6 +40,9 @@ HTLBOX_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/about/makefile.vc

@@ -40,6 +40,9 @@ ABOUT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/help/makefile.vc

@@ -40,6 +40,9 @@ HTMLHELP_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/helpview/makefile.vc

@@ -40,6 +40,9 @@ HELPVIEW_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/printing/makefile.vc

@@ -40,6 +40,9 @@ HTMLPRINTING_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/test/makefile.vc

@@ -40,6 +40,9 @@ TEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/virtual/makefile.vc

@@ -40,6 +40,9 @@ VIRTUAL_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/widget/makefile.vc

@@ -40,6 +40,9 @@ WIDGET_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/html/zip/makefile.vc

@@ -40,6 +40,9 @@ ZIP_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/image/makefile.vc

@@ -41,6 +41,9 @@ IMAGE_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -50,6 +53,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -89,6 +95,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -98,6 +107,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/internat/makefile.vc

@@ -40,6 +40,9 @@ INTERNAT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/ipc/makefile.vc

@@ -76,6 +76,9 @@ BASEIPCSERVER_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -85,6 +88,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -124,6 +130,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -133,6 +142,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/joytest/makefile.vc

@@ -40,6 +40,9 @@ JOYTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/keyboard/makefile.vc

@@ -40,6 +40,9 @@ KEYBOARD_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/layout/makefile.vc

@@ -40,6 +40,9 @@ LAYOUT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/listctrl/makefile.vc

@@ -40,6 +40,9 @@ LISTCTRL_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/mdi/makefile.vc

@@ -40,6 +40,9 @@ MDI_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/mediaplayer/makefile.vc

@@ -40,6 +40,9 @@ MEDIAPLAYER_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/memcheck/makefile.vc

@@ -40,6 +40,9 @@ MEMCHECK_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/menu/makefile.vc

@@ -40,6 +40,9 @@ MENU_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/mfc/makefile.vc

@@ -40,6 +40,9 @@ MFCTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/minimal/makefile.vc

@@ -40,6 +40,9 @@ MINIMAL_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/nativdlg/makefile.vc

@@ -40,6 +40,9 @@ NATIVDLG_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/notebook/makefile.vc

@@ -40,6 +40,9 @@ NOTEBOOK_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/oleauto/makefile.vc

@@ -40,6 +40,9 @@ OLEAUTO_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/opengl/cube/makefile.vc

@@ -40,6 +40,9 @@ CUBE_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/opengl/isosurf/makefile.vc

@@ -40,6 +40,9 @@ ISOSURF_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/opengl/penguin/makefile.vc

@@ -51,6 +51,9 @@ PENGUIN_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -60,6 +63,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -99,6 +105,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -108,6 +117,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/opengl/pyramid/makefile.vc

@@ -43,6 +43,9 @@ PYRAMID_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -52,6 +55,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -91,6 +97,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -100,6 +109,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/ownerdrw/makefile.vc

@@ -40,6 +40,9 @@ OWNERDRW_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/popup/makefile.vc

@@ -40,6 +40,9 @@ POPUP_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/power/makefile.vc

@@ -40,6 +40,9 @@ POWER_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/preferences/makefile.vc

@@ -40,6 +40,9 @@ PREFERENCES_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/printing/makefile.vc

@@ -40,6 +40,9 @@ PRINTING_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/propgrid/makefile.vc

@@ -43,6 +43,9 @@ PROPGRID_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -52,6 +55,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -91,6 +97,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -100,6 +109,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/regtest/makefile.vc

@@ -40,6 +40,9 @@ REGTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/render/makefile.vc

@@ -53,6 +53,9 @@ RENDDLL_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -62,6 +65,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -107,6 +113,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -116,6 +125,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/ribbon/makefile.vc

@@ -40,6 +40,9 @@ RIBBON_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/richtext/makefile.vc

@@ -40,6 +40,9 @@ RICHTEXT_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/sashtest/makefile.vc

@@ -40,6 +40,9 @@ SASHTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/scroll/makefile.vc

@@ -40,6 +40,9 @@ SCROLL_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/secretstore/makefile.vc

@@ -38,6 +38,9 @@ SECRETSTORE_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -47,6 +50,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -86,6 +92,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -95,6 +104,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/shaped/makefile.vc

@@ -40,6 +40,9 @@ SHAPED_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/sockets/makefile.vc

@@ -76,6 +76,9 @@ BASESERVER_OBJECTS =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -85,6 +88,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -124,6 +130,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -133,6 +142,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/sound/makefile.vc

@@ -40,6 +40,9 @@ SOUND_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/splash/makefile.vc

@@ -40,6 +40,9 @@ SPLASH_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/splitter/makefile.vc

@@ -40,6 +40,9 @@ SPLITTER_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/statbar/makefile.vc

@@ -40,6 +40,9 @@ STATBAR_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/stc/makefile.vc

@@ -42,6 +42,9 @@ STCTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -51,6 +54,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -90,6 +96,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -99,6 +108,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/svg/makefile.vc

@@ -40,6 +40,9 @@ SVGTEST_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/taborder/makefile.vc

@@ -40,6 +40,9 @@ TABORDER_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif

samples/taskbar/makefile.vc

@@ -40,6 +40,9 @@ TASKBAR_RESOURCES =  \
 !if "$(TARGET_CPU)" == "AMD64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -49,6 +52,9 @@ ARCH_SUFFIX = _x64
 !if "$(TARGET_CPU)" == "amd64"
 ARCH_SUFFIX = _x64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+ARCH_SUFFIX = _arm64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 ARCH_SUFFIX = _ia64
 !endif
@@ -88,6 +94,9 @@ LIBTYPE_SUFFIX = dll
 !if "$(TARGET_CPU)" == "AMD64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "ARM64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "IA64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif
@@ -97,6 +106,9 @@ LINK_TARGET_CPU = /MACHINE:X64
 !if "$(TARGET_CPU)" == "amd64"
 LINK_TARGET_CPU = /MACHINE:X64
 !endif
+!if "$(TARGET_CPU)" == "arm64"
+LINK_TARGET_CPU = /MACHINE:ARM64
+!endif
 !if "$(TARGET_CPU)" == "ia64"
 LINK_TARGET_CPU = /MACHINE:IA64
 !endif