Merge remote-tracking branch 'upstream/master' into vscript-saverestore

Author: samisalreadytaken

.github/workflows/mapbase_build-base.yml

@@ -194,7 +194,9 @@ jobs:
     - uses: actions/checkout@v3
 
     - name: Install GCC/G++ multilib
-      run: sudo apt-get install gcc-multilib g++-multilib
+      run: |
+        sudo apt-get update
+        sudo apt-get install gcc-multilib g++-multilib
 
     - name: Pick game
       if: inputs.project-group == 'game' || inputs.project-group == 'shaders'

sp/src/game/client/client_base.vpc

@@ -1261,7 +1261,7 @@ $Project
 		$ImpLib		steam_api
 
 		// Discord integration
-		$Lib	"$LIBPUBLIC\discord-rpc" [$MAPBASE_RPC]
+		$Lib	"$LIBPUBLIC\discord-rpc" [$MAPBASE_RPC&&!$LINUXALL]
 
 		$Lib $LIBCOMMON/libcrypto [$POSIX]
 

sp/src/game/client/client_mapbase.vpc

@@ -10,7 +10,7 @@ $Configuration
 	{
 		$PreprocessorDefinitions		"$BASE;ASW_PROJECTED_TEXTURES;DYNAMIC_RTT_SHADOWS;GLOWS_ENABLE"
 
-		$PreprocessorDefinitions		"$BASE;MAPBASE_RPC;DISCORD_RPC;STEAM_RPC"	[$MAPBASE_RPC]
+		$PreprocessorDefinitions		"$BASE;MAPBASE_RPC;DISCORD_RPC;STEAM_RPC"	[$MAPBASE_RPC&&!$LINUXALL]
 		$PreprocessorDefinitions		"$BASE;MAPBASE_VSCRIPT"		[$MAPBASE_VSCRIPT]
 		$PreprocessorDefinitions		"$BASE;NEW_RESPONSE_SYSTEM"		[$NEW_RESPONSE_SYSTEM]
 	}