Merge branch '3.6' of https://github.com/TF2V/TF2Vintage into 3.6

TF2V · Dec 3, 2024 · 28f6de5 · 28f6de5
2 parents 21b68b0 + 32efdb0
commit 28f6de5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -10,7 +10,7 @@ env:
 jobs:
   build:
     runs-on:
-      ubuntu-18.04
+      ubuntu-20.04
 
     steps:
       - name: Checkout

diff --git a/game/tf2vintage/version.txt b/game/tf2vintage/version.txt
@@ -1 +1 @@
-version=12.01.2024
+version=12.02.2024
diff --git a/src/vpc_scripts/source_dll_win32_base.vpc b/src/vpc_scripts/source_dll_win32_base.vpc
@@ -114,7 +114,7 @@ $Project
 				$CustomBuildStep
 				{
 					// General
-					$CommandLine				"$QUOTE$(VCInstallDir)Tools\MSVC\$(VCToolsVersion)\bin\Hostx64\x86\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE"
+					$CommandLine				"$QUOTE$(VCInstallDir_140)bin\ml.exe$QUOTE /safeseh /c /Cp /Zi /Fo$QUOTE$(IntDir)$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE"
 					$Description				"Compiling pointeroverride.asm"
 					$Outputs					"$(IntDir)\$(InputName).obj"
 				}