Merge branch 'Sectonidse:master' into master

Author: maksw2

.github/workflows/compile.yml

@@ -24,26 +24,30 @@ permissions:
   contents: read
 
 jobs:
-  build:
+  Shaders:
     runs-on: windows-latest
-
     steps:
     - uses: actions/checkout@v4
 
-    - name: Add MSBuild to PATH
-      uses: microsoft/[email protected]
-
     # ENABLE THIS ON FIRST TIME SETUP
     #- name: Install Strawberry Perl for Shaders compilation
     #  run: choco install strawberryperl
 
     - name: Install Shader Dependencies
       run: cpan String::CRC32
 
-
     - name: Compile Shaders
       working-directory: ${{env.GITHUB_WORKSPACE}}
-      run: ./materialsystem/swarmshaders/buildshaders.bat game_shader_generic_swarm deferred_shaders
+      run: ./materialsystem/swarmshaders/buildshaders.bat deferred_shaders
+
+
+  Game:
+    runs-on: windows-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Add MSBuild to PATH
+      uses: microsoft/[email protected]
 
     - name: Build
       working-directory: ${{env.GITHUB_WORKSPACE}}

devtools/bin/valve_perl_helpers.pl

@@ -362,7 +362,9 @@ sub LoadShaderListFile
 	my $inputbase = shift;
 
 	my @srcfiles;
-	&MakeSureFileExists( "$inputbase.txt", 1, 0 );
+
+  	# Why was it checking if directory is a file?
+	# &MakeSureFileExists( "$inputbase.txt", 1, 0 );
 
 	open SHADERLISTFILE, "<$inputbase.txt" || die;
 	my $line;

materialsystem/swarmshaders/buildshaders.bat

@@ -1,23 +1,21 @@
 @echo off
+echo ----------[ DEFUN buildshaders ]----------
 
 set TTEXE=time /t
-
-echo.
-echo -----<| buildshaders |>-----
 %TTEXE% -cur-Q
 set tt_start=%ERRORLEVEL%
 set tt_chkpt=%tt_start%
 
 
-REM ****************
 REM usage: buildshaders <shaderProjectName>
-REM ****************
+
+echo Program started at %TTEXE%
 
 setlocal
 set arg_filename=%1
 set shadercompilecommand=shadercompile.exe
 set targetdir=shaders
-set SrcDirBase=../..
+set SrcDirBase=.
 set shaderDir=shaders
 set SDKArgs=
 set SHADERINCPATH=vshtmp9/... fxctmp9/... include/...
@@ -82,21 +80,20 @@ REM ****************
 REM ERRORS
 REM ****************
 :InvalidGameDirectory
-echo -
-echo Error: "%~3" is not a valid game directory.
-echo (The -game directory must have a gameinfo.txt file)
-echo -
+echo "-----X[ ERROR ]X-----"
+echo ├ "%~3" is not a valid game directory.
+echo └ (The -game directory must have a gameinfo.txt file)
 goto end
 
 :NoSourceDirSpecified
-echo ERROR: If you specify -game on the command line, you must specify -source.
+echo "-----X[ ERROR ]X-----"
+echo "└ If you specify -game on the command line, you must specify -source."
 goto usage
 goto end
 
 :NoShaderCompile
-echo -
-echo - ERROR: shadercompile.exe doesn't exist in %SDKBINDIR%
-echo -
+echo "-----X[ ERROR ]X-----"
+echo "└ shadercompile.exe doesn't exist in %SDKBINDIR%"
 goto end
 
 REM ****************
@@ -123,7 +120,7 @@ if exist vcslist.txt del /f /q vcslist.txt
 REM ****************
 REM Generate a makefile for the shader project
 REM ****************
-perl %SrcDirBase%/devtools/bin/updateshaders.pl -source .
+perl %SrcDirBase%/devtools/bin/updateshaders.pl -source %inputbase%
 
 
 REM ****************
@@ -132,7 +129,8 @@ REM ****************
 rem cmake -G "NMake Makefiles" /S /C /F ./makefile.%inputbase%
 echo Building inc files, asm vcs files, and VMPI worklist for %inputbase%...
 REM https://cmake.org/cmake/help/v3.30/generator/NMake%20Makefiles.html very helpful of you cmake
-cmake -G "NMake Makefiles" /S ./makefile.%inputbase%
+cmake -G "NMake Makefiles" ./materialsystem/swarmshaders/
+nmake
 
 REM ****************
 REM Copy the inc files to their target

public/tier0/platform.h

@@ -1118,7 +1118,7 @@ struct CPUInformation
 
 	tchar* m_szProcessorID;				// Processor vendor Identification.
 
-	CPUInformation(): m_Size(0){}
+	// CPUInformation(): m_Size(0){}
 };
 
 PLATFORM_INTERFACE const CPUInformation& GetCPUInformation();

public/tier1/UtlSortVector.h

@@ -177,7 +177,7 @@ void CUtlSortVector<T, LessFunc>::QuickSort( LessFunc& less, int nLower, int nUp
 		ctx.m_pLessContext = m_pLessContext;
 		ctx.m_pLessFunc = &less;
 
-		qsort_s( Base(), Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
+		qsort_s( this->Base(), this->Count(), sizeof(T), (QSortCompareFunc_t)&CUtlSortVector<T, LessFunc>::CompareHelper, &ctx );
 	}
 #else
 	typedef int (__cdecl *QSortCompareFunc_t)( const void *, const void *);

public/tier1/convar.h

@@ -1,4 +1,4 @@
-//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
+//===== Copyright © 1996-2005, Valve Corporation, All rights reserved. ======//
 //
 // Purpose: 
 //
@@ -16,6 +16,9 @@
 #pragma once
 #endif
 
+// This is for fixing "error LNK2019: unresolved external symbol _sscanf referenced in ConVar::InternalSetColorFromString"
+#pragma comment (lib, "legacy_stdio_definitions.lib")
+
 #include "tier0/dbg.h"
 #include "tier1/iconvar.h"
 #include "tier1/utlvector.h"