Fix MinGW ci (#371)

This commit is contained in:
Jérôme Leclercq 2022-04-20 02:01:03 +02:00 committed by GitHub
parent e11644a81d
commit 7a990c757f
2 changed files with 21 additions and 5 deletions

View File

@ -53,9 +53,13 @@ jobs:
# Install xmake
- name: Setup xmake
uses: xmake-io/github-action-setup-xmake@v1
with:
xmake-version: branch@dev
run: |
git clone https://github.com/xmake-io/xmake.git --recurse-submodules -b dev xmake_git
cd xmake_git
make build
make install PREFIX=/${{ matrix.msystem }}
xmake --version
cd ..
# Update xmake repository (in order to have the file that will be cached)
- name: Update xmake repository
@ -79,7 +83,7 @@ jobs:
# Build the engine
- name: Build Nazara
run: xmake -v
run: xmake
# Run unit tests
- name: Run unit tests
@ -94,4 +98,4 @@ jobs:
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.mode }}
path: package
path: package

View File

@ -5,6 +5,18 @@ rule("compile_shaders")
target:set("policy", "build.across_targets_in_parallel", false)
end)
-- temporary fix
before_build("mingw", function (target)
local mingw = target:toolchain("mingw")
local bindir = mingw:bindir()
local targetdir = target:targetdir()
if bindir then
os.trycp(path.join(bindir, "libgcc_s_seh-1.dll"), targetdir)
os.trycp(path.join(bindir, "libstdc++-6.dll"), targetdir)
os.trycp(path.join(bindir, "libwinpthread-1.dll"), targetdir)
end
end)
before_buildcmd_file(function (target, batchcmds, shaderfile, opt)
local nzslc = target:dep("NazaraShaderCompiler")