Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CONFIGURE][CMAKE] Add support for MSVC ARM64 target

Browse source 
Addendum to e4feaa1a and 51e2ab52. CORE-17518
This commit is contained in:
Stanislav Motylkov 2021-10-16 16:30:36 +03:00
parent b7c1b95b45
commit b3b1bd66a0
No known key found for this signature in database
GPG key ID: AFE513258CBA9E92
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configure.cmd
View file

@ -50,6 +50,7 @@ if defined ROS_ARCH (
cl 2>&1 | find "x86" > NUL && set ARCH=i386 cl 2>&1 | find "x86" > NUL && set ARCH=i386
cl 2>&1 | find "x64" > NUL && set ARCH=amd64 cl 2>&1 | find "x64" > NUL && set ARCH=amd64
cl 2>&1 | find "ARM" > NUL && set ARCH=arm 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 | 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\.1.\." > NUL && set VS_VERSION=15
cl 2>&1 | findstr /R /c:"19\.2.\." > NUL && set VS_VERSION=16 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 set CMAKE_ARCH=-A x64
) else if "!ARCH!" == "arm" ( ) else if "!ARCH!" == "arm" (
set CMAKE_ARCH=-A ARM set CMAKE_ARCH=-A ARM
) else if "!ARCH!" == "arm64" (
set CMAKE_ARCH=-A ARM64
) )
) else if /I "%1" NEQ "" ( ) else if /I "%1" NEQ "" (
echo.%1| find /I "-D" >nul 2>&1 echo.%1| find /I "-D" >nul 2>&1

2
sdk/cmake/msvc.cmake
View file

@ -416,6 +416,8 @@ elseif((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR}))
set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe)
elseif(ARCH STREQUAL "arm") elseif(ARCH STREQUAL "arm")
set(CMAKE_ASM16_COMPILER armasm.exe) set(CMAKE_ASM16_COMPILER armasm.exe)
elseif(ARCH STREQUAL "arm64")
set(CMAKE_ASM16_COMPILER armasm64.exe)
else() else()
set(CMAKE_ASM16_COMPILER ml.exe) set(CMAKE_ASM16_COMPILER ml.exe)
endif() endif()