Merge branch 'spirit/spirit-1.8' into spirit/spirit-1.8-bug-fixes

LogicAndTrick · Sep 6, 2024 · cb8c0ea · cb8c0ea
2 parents 3d40ce2 + 8e9f410
commit cb8c0ea
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/.github/workflows/spirit-updated.yaml b/.github/workflows/spirit-updated.yaml
@@ -9,27 +9,19 @@ jobs:
   linux:
     name: Linux-x86
     runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        compiler: [g++, clang++]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install G++ Multilib, Clang++ & OpenGL library
-        run: |
-          sudo apt update
-          sudo apt install -y g++-multilib clang libgl1-mesa-dev libglu1-mesa-dev
-      
       - name: Build
-        run: |
-          cd linux
-          make COMPILER=${{ matrix.compiler }} CFG=release -j2
+        uses: docker://registry.gitlab.steamos.cloud/steamrt/scout/sdk/i386:latest
+        with:
+          args: sh linux/ci-make.sh g++
 
       - name: Deploy
         uses: actions/upload-artifact@v4
         with:
-          name: Linux-x86-${{ matrix.compiler }}
+          name: Linux-x86
           path: |
             linux/release/client.so
             linux/release/client.so.dbg

diff --git a/linux/Makefile.hl_cdll b/linux/Makefile.hl_cdll
@@ -19,7 +19,7 @@ CFLAGS=$(BASE_CFLAGS) $(ARCH_CFLAGS) -DCLIENT_DLL
 
 INCLUDEDIRS=-I$(HL_SRC_DIR) -I$(HL_PARTICLEMAN_DIR) -I../dlls -I/usr/include/malloc -I$(COMMON_SRC_DIR) -I$(PUBLIC_SRC_DIR) -I../pm_shared -I../engine -I../utils/vgui/include -I../game_shared -I../external
 
-LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -L$(CFG) vgui.so -L. libSDL2-2.0.so.0
+LDFLAGS=$(SHLIBLDFLAGS) $(CPP_LIB) -Wl,--no-as-needed -lGL -lGLU -Wl,--as-needed -L$(CFG) vgui.so -L. libSDL2-2.0.so.0
 
 DO_CC=$(CPLUS) $(INCLUDEDIRS) $(CFLAGS) -o $@ -c $<
 

diff --git a/linux/ci-make.sh b/linux/ci-make.sh
@@ -0,0 +1,11 @@
+
+update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 10
+update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-9 10
+update-alternatives --install /usr/bin/cpp cpp-bin /usr/bin/cpp-9 10
+
+update-alternatives --set gcc /usr/bin/gcc-9
+update-alternatives --set g++ /usr/bin/g++-9
+update-alternatives --set cpp-bin /usr/bin/cpp-9
+
+cd linux
+make COMPILER=g++ CFG=release USE_STEAM_RUNTIME=1 VALVE_NO_AUTO_P4=1 -j2