From 1b079ef0d823cfdb343109b7b3e243687933012b Mon Sep 17 00:00:00 2001
From: rjindael <me@rjindael.xyz>
Date: Fri, 21 Jul 2023 00:02:21 -0700
Subject: [PATCH] Fix GLSL shaders output in CI and drop old GL

---
 .github/workflows/build.yml | 2 +-
 Content/win32_plugins.cfg   | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6cd0612..20b5585 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
         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 '/${{ matrix.sys }}/bin/{}.dll' build/dist/plugins/
       
       - name: Add OGRE shaders
-        run: mkdir build/dist/shaders && cp -R /${{ matrix.sys }}/share/OGRE/Media/Main/* build/dist/shaders && cp -R /${{ matrix.sys }}/share/OGRE/Media/RTShaderLib/* build/dist/shaders
+        run: mkdir build/dist/shaders && cp -R /${{ matrix.sys }}/share/OGRE/Media/Main/* build/dist/shaders && cp -R /${{ matrix.sys }}/share/OGRE/Media/RTShaderLib/* build/dist/shaders && mv build/dist/shaders/GLSL/* build/dist/shaders && rm -rf build/dist/shaders/GLSL
     
       - name: Add additional runtime dependencies
         run: ldd build/dist/*.exe | grep "=> /" | awk '{print $3}' | grep "${{ matrix.sys }}" | xargs -I '{}' cp -v '{}' build/dist
diff --git a/Content/win32_plugins.cfg b/Content/win32_plugins.cfg
index 36d176b..a4d5072 100644
--- a/Content/win32_plugins.cfg
+++ b/Content/win32_plugins.cfg
@@ -1,6 +1,5 @@
 PluginFolder=plugins
 
-Plugin=RenderSystem_GL
 Plugin=RenderSystem_GL3Plus
 Plugin=RenderSystem_GLES2
 Plugin=Plugin_ParticleFX
@@ -8,4 +7,4 @@ Plugin=Plugin_BSPSceneManager
 Plugin=Codec_STBI
 Plugin=Plugin_PCZSceneManager
 Plugin=Plugin_OctreeZone
-Plugin=Plugin_OctreeSceneManager
+Plugin=Plugin_OctreeSceneManager
\ No newline at end of file