From 0a2388a3438b798d964abbdec294dcbc67afc4a6 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Tue, 11 Apr 2023 18:17:40 +0200 Subject: [PATCH] Move MinGW isystem fix to xmake.lua --- .github/workflows/msys2-build.yml | 2 +- xmake.lua | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/msys2-build.yml b/.github/workflows/msys2-build.yml index 9ad35b64d..88010f46a 100644 --- a/.github/workflows/msys2-build.yml +++ b/.github/workflows/msys2-build.yml @@ -94,7 +94,7 @@ jobs: # Setup compilation mode and install project dependencies - name: Configure xmake and install dependencies - run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --ccache=n --ffmpeg=y --shadernodes=y --tests=y --unitybuild=y --yes --policies=package.include_external_headers:n + run: xmake config --arch=${{ matrix.arch }} --mode=${{ matrix.mode }} --ccache=n --ffmpeg=y --shadernodes=y --tests=y --unitybuild=y --yes # Build the engine - name: Build Nazara diff --git a/xmake.lua b/xmake.lua index d193b6c61..cd3ddd6a1 100644 --- a/xmake.lua +++ b/xmake.lua @@ -376,6 +376,7 @@ if is_plat("windows") then elseif is_plat("mingw") then add_cxflags("-Og", "-Wa,-mbig-obj") add_ldflags("-Wa,-mbig-obj") + set_policy("package.include_external_headers", false) elseif is_plat("wasm") then add_cxflags("-sNO_DISABLE_EXCEPTION_CATCHING") add_ldflags("-sNO_DISABLE_EXCEPTION_CATCHING", "-sALLOW_MEMORY_GROWTH", "-sWASM_BIGINT")