diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4cf172d84..23dddf687 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,7 +21,7 @@ jobs: with: runner: windows-latest binary: windows - build: '["windows"]' + build: '["windows-x64", "windows-arm64"]' build-macos: name: Build MacOS diff --git a/packages/realm_dart/CMakePresets.json b/packages/realm_dart/CMakePresets.json index b802ce4be..f1f115051 100644 --- a/packages/realm_dart/CMakePresets.json +++ b/packages/realm_dart/CMakePresets.json @@ -28,13 +28,22 @@ "name": "windows", "inherits": "default", "generator": "Visual Studio 17 2022", - "architecture": "x64", "condition": { "lhs": "${hostSystemName}", "type": "equals", "rhs": "Windows" } }, + { + "name": "windows-x64", + "inherits": "windows", + "architecture": "x64" + }, + { + "name": "windows-arm64", + "inherits": "windows", + "architecture": "ARM64" + }, { "name": "macos", "displayName": "macOS", @@ -125,11 +134,17 @@ "configuration": "Debug" }, { - "name": "windows", - "configurePreset": "windows", + "name": "windows-x64", + "configurePreset": "windows-x64", "displayName": "x64", "configuration": "Debug" }, + { + "name": "windows-arm64", + "configurePreset": "windows-arm64", + "displayName": "arm64", + "configuration": "Debug" + }, { "name": "android-x86_64", "configurePreset": "android-x86_64", diff --git a/packages/realm_dart/scripts/build.bat b/packages/realm_dart/scripts/build.bat index 208b0304c..d285edbe5 100644 --- a/packages/realm_dart/scripts/build.bat +++ b/packages/realm_dart/scripts/build.bat @@ -7,5 +7,11 @@ pushd "%~dp0.." echo %CD% -cmake --preset windows -cmake --build --preset windows --config MinSizeRel +@REM only building for x64 if no arguments +set ABIS=x64 arm64 +if [%1]==[] set ABIS=x64 + +(for %%a in (%ABIS%) do ( + cmake --preset windows-%%a + cmake --build --preset windows-%%a --config MinSizeRel +)) \ No newline at end of file diff --git a/packages/realm_dart/src/realm-core b/packages/realm_dart/src/realm-core index 1f2a4c741..f3d7ae5f9 160000 --- a/packages/realm_dart/src/realm-core +++ b/packages/realm_dart/src/realm-core @@ -1 +1 @@ -Subproject commit 1f2a4c74112c1988b00a862d348e3f91200c5c4b +Subproject commit f3d7ae5f9f31d90b327a64536bb7801cc69fd85b