From a2f9a1b5ba81c9628a4cb2e95673db3ed1cadc6e Mon Sep 17 00:00:00 2001 From: rjindael Date: Mon, 17 Jul 2023 18:40:47 -0700 Subject: [PATCH] ci: hotfixes --- .github/workflows/ci.yml | 7 +++++-- Content/win32_plugins.cfg | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3f3a8be..a96379f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,19 +39,22 @@ jobs: - name: Build (Ninja) run: ninja -C build + # ouch - unless and until we start using CMake's install command, these commands are a necessary evil - name: Organize binaries run: mkdir build/dist && mv build/*.exe build/dist && cd build/dist && for x in *.exe; do mv $x "RNR.$x"; done && cd ../../ - name: Add Qt dependencies run: windeployqt6 build/dist/*.exe - # ouch - unless and until we start using CMake's install command, these commands are a necessary evil - name: Add runtime dependencies run: ldd build/dist/*.exe | grep "=> /" | awk '{print $3}' | grep "mingw64" | xargs -I '{}' cp -v '{}' build/dist - name: Add OGRE plugins run: cp Content/win32_plugins.cfg build/dist/plugins.cfg && mkdir build/dist/plugins/ && cat build/dist/plugins.cfg | grep "Plugin=" | sed -e "s/Plugin=//" | xargs -I '{}' cp -v '/mingw64/bin/{}.dll' build/dist/plugins/ - + + - name: Add OGRE shaders + run: mkdir build/dist/ShaderCache && mkdir build/dist/shaders && cp -R /mingw64/share/OGRE/Media/Main build/dist/shaders && cp -R /mingw64/share/OGRE/Media/RTShaderLib build/dist/shaders + - name: Add resources run: cp -R Content/RNR build/dist/content && cp LICENSE build/dist diff --git a/Content/win32_plugins.cfg b/Content/win32_plugins.cfg index c00fda7..dd1f5f5 100644 --- a/Content/win32_plugins.cfg +++ b/Content/win32_plugins.cfg @@ -1,7 +1,7 @@ PluginFolder=plugins -Plugin=RenderSystem_Direct3D9 -Plugin=RenderSystem_Direct3D11 +# Plugin=RenderSystem_Direct3D9 +# Plugin=RenderSystem_Direct3D11 Plugin=RenderSystem_GL Plugin=RenderSystem_GL3Plus Plugin=RenderSystem_GLES2