Fix Linux dedicated binaries by building separately

.github/workflows/pipeline.yml

@@ -31,6 +31,12 @@ jobs:
             arch: x64
           - platform: linux
             arch: x86
+          - platform: linux
+            arch: x64
+            dedicated: true
+          - platform: linux
+            arch: x86
+            dedicated: true
     runs-on: ${{ matrix.platform == 'windows' && 'windows-latest' || 'ubuntu-latest' }}
     container: ${{ matrix.platform == 'linux' && 'registry.gitlab.steamos.cloud/steamrt/sniper/sdk:latest' || '' }}
     steps:
@@ -58,7 +64,7 @@ jobs:
       if: runner.os == 'Linux'
       working-directory: ${{ github.workspace }}/src
       run: |
-        VPC_NINJA_BUILD_MODE=${{env.BUILD_TYPE}} devtools/bin/vpc /${{ matrix.arch == 'x86' && 'linux32' || 'linux64' }} /jbmod /ninja /define:SOURCESDK ${{ env.BUILD_TYPE == 'Retail' && '/define:PUBLISH' || '' }} +everything /mksln _vpc_/ninja/${{ matrix.arch }}
+        VPC_NINJA_BUILD_MODE=${{env.BUILD_TYPE}} devtools/bin/vpc /${{ matrix.arch == 'x86' && 'linux32' || 'linux64' }} /jbmod /ninja /define:SOURCESDK ${{ env.BUILD_TYPE == 'Retail' && '/define:PUBLISH' || '' }} ${{ matrix.dedicated && '/dedicated +dedicated' || '+everything' }} /mksln _vpc_/ninja/${{ matrix.arch }}
         if [ "${{ matrix.arch }}" = "x86" ]; then
           sed -i 's/i386-linux/i686-linux/g' _vpc_/ninja/${{ matrix.arch }}.ninja
         fi
@@ -79,12 +85,14 @@ jobs:
     - name: Build (Linux)
       if: runner.os == 'Linux'
       working-directory: ${{ github.workspace }}/src
-      run: ninja -f "_vpc_/ninja/${{ matrix.arch }}.ninja" -j$(nproc)
+      run: |
+        ninja -f "_vpc_/ninja/${{ matrix.arch }}.ninja" -j$(nproc)
+        rm -f ../game/srcds*
 
     - name: Store artifacts
       uses: actions/upload-artifact@v7
       with:
-        name: game-${{ matrix.platform }}-${{ matrix.arch }}
+        name: game-${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.dedicated && 'srv' || '' }}
         retention-days: 1
         path: |
           game
@@ -94,7 +102,7 @@ jobs:
     - name: Store symbol artifacts
       uses: actions/upload-artifact@v7
       with:
-        name: game-${{ matrix.platform }}-${{ matrix.arch }}-sym
+        name: game-${{ matrix.platform }}-${{ matrix.arch }}${{ matrix.dedicated && 'srv' || '' }}-sym
         retention-days: 1
         path: |
           game/**/*.${{ matrix.platform == 'windows' && 'pdb' || 'dbg' }}
@@ -219,8 +227,10 @@ jobs:
 
               cp -r $art/* dist/$target/
               rm -f dist/$target/srcds*
+              rm -f dist/$target/jbmod/bin/*_srv* dist/$target/jbmod/bin/linux64/*_srv*
               cp -r $art/* dist_srcds/$target/
               rm -f dist_srcds/$target/jbmod_* dist_srcds/$target/jbmod*.exe
+              rm -f dist_srcds/$target/jbmod/bin/client* dist_srcds/$target/jbmod/bin/x64/client* dist_srcds/$target/jbmod/bin/linux64/client*
             fi
           done
 

src/launcher_main/dedicated_main_jbmod.vpc

@@ -1,7 +1,7 @@
 $Macro OUTBINNAME "srcds"
 
 $Conditional "MOD_LAUNCHER" "1"
-$Conditional "DEDICATED" "1"
+$Conditional "DED_LAUNCHER" "1"
 
 $Include "launcher_main.vpc"
 

src/launcher_main/main.cpp

@@ -36,7 +36,7 @@ typedef int (*LauncherMain_t)( int argc, char **argv );
 #error
 #endif
 
-#ifndef DEDICATED
+#ifndef DED_LAUNCHER
 #ifdef WIN32
 // hinting the nvidia driver to use the dedicated graphics card in an optimus configuration
 // for more info, see: http://developer.download.nvidia.com/devzone/devcenter/gamegraphics/files/OptimusRenderingPolicies.pdf
@@ -224,7 +224,7 @@ static bool GetGameInstallDir( const char *pRootDir, char *pszBuf, int nBufSize
 		unLength = pSteamApps->GetAppInstallDir( k_unMyModAppid, pszBuf, nBufSize );
 	}
 
-#ifndef DEDICATED
+#ifndef DED_LAUNCHER
 	UnloadSteam();
 #endif
 
@@ -462,7 +462,7 @@ int APIENTRY WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdL
 
 	SetEnvironmentVariableA( "SDK_EXEC_DIR", szGameInstallDir );
 
-#ifdef DEDICATED
+#ifdef DED_LAUNCHER
 #define LAUNCHER_PROCNAME	"DedicatedMain"
 #define LAUNCHER_DLL_PATH	"%s\\" PLATFORM_BIN_DIR "\\dedicated.dll"
 #else