Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,20 @@ jobs:
ext: .dll
os: windows-latest

WindowsArm64:
strategy:
fail-fast: false
matrix:
haxe: [ 4.3.7, latest ]
uses: ./.github/workflows/test.yml
name: Test Windows (Arm64)
with:
haxe: ${{ matrix.haxe }}
arch: Arm64
sep: \
ext: .dll
os: windows-11-arm

MacOS64:
strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ runs:
using: composite
steps:
- name: install haxe
uses: krdlab/setup-haxe@v2
uses: krdlab/setup-haxe@f37045f8d4e04adddecf8fd1acc024ef03680734
with:
haxe-version: ${{ inputs.haxe }}

Expand Down
4 changes: 3 additions & 1 deletion src/hx/Lib.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,9 @@ String __hxcpp_get_bin_dir()
HX_CSTRING("WinRT");
#endif
#elif defined(_WIN32)
#ifdef HXCPP_M64
#ifdef HXCPP_ARM64
HX_CSTRING("WindowsArm64");
#elif defined(HXCPP_M64)
HX_CSTRING("Windows64");
#else
HX_CSTRING("Windows");
Expand Down
13 changes: 2 additions & 11 deletions toolchain/msvc-arm64-setup.bat
Original file line number Diff line number Diff line change
@@ -1,19 +1,10 @@
setlocal enabledelayedexpansion
@if exist "%HXCPP_MSVC%\..\..\VC\" (
@if not exist "%hxcpp_msvc%\..\..\VC\Auxiliary\Build\vcvars%msvc_host_arch%_arm64.bat" (
@echo Error: the specified MSVC version does not have vcvars%msvc_host_arch%_arm64.bat setup script
) else (
@echo "%HXCPP_MSVC%"
@call "%HXCPP_MSVC%\..\..\VC\Auxiliary\Build\vcvars%msvc_host_arch%_amd64.bat"
@echo HXCPP_VARS
@set
)
) else if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
@if exist "%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" (
for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -products * -requires Microsoft.VisualStudio.Component.VC.Tools.arm64 -property installationPath`) do (
@set InstallDir=%%i
)
@if exist "!InstallDir!\Common7\Tools\VsDevCmd.bat" (
@call "!InstallDir!\Common7\Tools\VsDevCmd.bat" -host_arch=%msvc_host_arch% -arch=arm64 -app_platform=Desktop -no_logo
@call "!InstallDir!\Common7\Tools\VsDevCmd.bat" -arch=arm64 -app_platform=Desktop -no_logo
@echo HXCPP_VARS
@set
) else (
Expand Down
1 change: 0 additions & 1 deletion tools/hxcpp/Setup.hx
Original file line number Diff line number Diff line change
Expand Up @@ -836,7 +836,6 @@ class Setup
Sys.putEnv("HXCPP_WINXP_COMPAT","1");
xpCompat = true;
}
Sys.putEnv("msvc_host_arch", ioDefines.exists("windows_arm_host") ? "x86" : "x64" );

var vc_setup_proc = new Process("cmd.exe", ["/C", BuildTool.HXCPP + "\\toolchain\\msvc" + extra + "-setup.bat" ]);
var vars_found = false;
Expand Down
Loading