[ros-diffs] [reactos] 01/01: [CONFIGURE][CMAKE] Add support for MSVC ARM64 target

[Stanislav Motylkov]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b3b1bd66a07ecc7b510e4…

commit b3b1bd66a07ecc7b510e490d407eac676faab310
Author:     Stanislav Motylkov <x86corez(a)gmail.com>
AuthorDate: Sat Oct 16 16:30:36 2021 +0300
Commit:     Stanislav Motylkov <x86corez(a)gmail.com>
CommitDate: Sat Oct 16 16:30:36 2021 +0300

    [CONFIGURE][CMAKE] Add support for MSVC ARM64 target
    
    Addendum to e4feaa1a and 51e2ab52. CORE-17518
---
 configure.cmd        | 3 +++
 sdk/cmake/msvc.cmake | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/configure.cmd b/configure.cmd
index 813fb48f2e3..53eb586b339 100755
--- a/configure.cmd
+++ b/configure.cmd
@@ -50,6 +50,7 @@ if defined ROS_ARCH (
     cl 2>&1 | find "x86" > NUL && set ARCH=i386
     cl 2>&1 | find "x64" > NUL && set ARCH=amd64
     cl 2>&1 | find "ARM" > NUL && set ARCH=arm
+    cl 2>&1 | find "ARM64" > NUL && set ARCH=arm64
     cl 2>&1 | find "19.00." > NUL && set VS_VERSION=14
     cl 2>&1 | findstr /R /c:"19\.1.\." > NUL && set
VS_VERSION=15
     cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set
VS_VERSION=16
@@ -121,6 +122,8 @@ REM Parse command line parameters
                 set CMAKE_ARCH=-A x64
             ) else if "!ARCH!" == "arm" (
                 set CMAKE_ARCH=-A ARM
+            ) else if "!ARCH!" == "arm64" (
+                set CMAKE_ARCH=-A ARM64
             )
         ) else if /I "%1" NEQ "" (
             echo.%1| find /I "-D" >nul 2>&1
diff --git a/sdk/cmake/msvc.cmake b/sdk/cmake/msvc.cmake
index 925fbe8c7fb..d284cae91a5 100644
--- a/sdk/cmake/msvc.cmake
+++ b/sdk/cmake/msvc.cmake
@@ -416,6 +416,8 @@ elseif((ARCH STREQUAL "amd64") AND (DEFINED
ENV{VCINSTALLDIR}))
     set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe)
 elseif(ARCH STREQUAL "arm")
     set(CMAKE_ASM16_COMPILER armasm.exe)
+elseif(ARCH STREQUAL "arm64")
+    set(CMAKE_ASM16_COMPILER armasm64.exe)
 else()
     set(CMAKE_ASM16_COMPILER ml.exe)
 endif()