diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fff1e3534..629059c6e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,8 +23,8 @@ env: WINE_URL: https://github.com/3Shain/wine/releases/download/v8.16-3shain/wine.tar.gz WINE_ARM64EC_VERSION: wine-11.2 WINE_ARM64EC_URL: https://github.com/3Shain/wine/releases/download/wine-11.2/wine-11.2.tar.gz - LLVM_MINGW_VERSION: "20251216" - LLVM_MINGW_DIR: llvm-mingw-20251216-ucrt-macos-universal + LLVM_MINGW_VERSION: "20260812" + LLVM_MINGW_DIR: llvm-mingw-20260812-ucrt-macos-universal jobs: setup-wine: diff --git a/meson.build b/meson.build index e10c90191..34c573997 100644 --- a/meson.build +++ b/meson.build @@ -60,6 +60,12 @@ if cpu_family == 'x86' ] endif +if cpu_family == 'aarch64' and dxmt_crossbuild + compiler_args += [ + '-marm64x', + ] +endif + native_compiler_args = [ '-Wimplicit-fallthrough', '-Wno-unused-parameter',