Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for building for Windows ARM64 #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Add support for building for Windows ARM64 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3914c56
Add support for Windows ARM64.
ddscentral Jan 12, 2025
1681ddc
windows/config/toolchain.cmd: Properly add Windows ARM64 support.
ddscentral Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions windows/cmake/generate.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,19 @@ IF "%PROJECT_TYPE%" == "vs" (
SET CMAKE_A_OPT=-A ARM
)
) ELSE (
IF "%TOOLCHAIN_CMAKE_A_OPT%" == "" (
SET CMAKE_A_OPT=
IF "%BUILDARCH%" == "arm64" (
IF "%TOOLCHAIN_CMAKE_A_OPT%" == "" (
SET GEN_PROJECT_TYPE="%TOOLCHAIN_NAME% ARM64"
) ELSE (
SET CMAKE_A_OPT=-A ARM64
)
) ELSE (
SET CMAKE_A_OPT=-A Win32
)
IF "%TOOLCHAIN_CMAKE_A_OPT%" == "" (
SET CMAKE_A_OPT=
) ELSE (
SET CMAKE_A_OPT=-A Win32
)
)
)
)
)
Expand Down
25 changes: 17 additions & 8 deletions windows/config/toolchain.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,17 @@ IF "%VSVERSION%" == "2019" (
SET TOOLCHAIN32="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAIN64="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAINARM="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAINARM64="%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat"
) ELSE (
SET TOOLCHAIN32="%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAIN64="%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAINARM="%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat"
SET TOOLCHAINARM64="%VS160COMNTOOLS%..\..\VC\Auxiliary\Build\vcvarsall.bat"
)
SET TOOLCHAIN32CFG=x86
SET TOOLCHAIN64CFG=amd64
SET TOOLCHAINARMCFG=amd64_arm
SET TOOLCHAINARM64CFG=amd64_arm64
SET TOOLCHAIN_NAME=Visual Studio 16 2019
SET TOOLCHAIN_CMAKE_A_OPT=-A
)
Expand All @@ -69,15 +72,21 @@ IF "%BUILDARCH%" == "amd64" (
CALL %TOOLCHAIN64% %TOOLCHAIN64CFG%
IF %errorlevel% neq 0 EXIT /b %errorlevel%
) ELSE (
IF "%BUILDARCH%" == "arm" (
SET CMWAKE_WIN64=^-DCMAKE_SYSTEM_NAME^=WindowsStore ^-DCMAKE_SYSTEM_VERSION^=10.0
CALL %TOOLCHAINARM% %TOOLCHAINARMCFG%
IF "%BUILDARCH%" == "arm64" (
SET CMWAKE_WIN64=^-D_M_ARM64=1 ^-DCMAKE_SYSTEM_VERSION^=10.0
CALL %TOOLCHAINARM64% %TOOLCHAINARM64CFG%
IF %errorlevel% neq 0 EXIT /b %errorlevel%
) ELSE (
SET CMWAKE_WIN64=^-DWIN32^=1
CALL %TOOLCHAIN32% %TOOLCHAIN32CFG%
IF %errorlevel% neq 0 EXIT /b %errorlevel%
)
) ELSE (
IF "%BUILDARCH%" == "arm" (
SET CMWAKE_WIN64=^-DCMAKE_SYSTEM_NAME^=WindowsStore ^-DCMAKE_SYSTEM_VERSION^=10.0
CALL %TOOLCHAINARM% %TOOLCHAINARMCFG%
IF %errorlevel% neq 0 EXIT /b %errorlevel%
) ELSE (
SET CMWAKE_WIN64=^-DWIN32^=1
CALL %TOOLCHAIN32% %TOOLCHAIN32CFG%
IF %errorlevel% neq 0 EXIT /b %errorlevel%
)
)
)

rem ===========================================================================
Expand Down