6 files changed, 24 insertions, 8 deletions
diff --git a/mp/src/vpc_scripts/groups.vgc b/mp/src/vpc_scripts/groups.vgc
index 93f7b2c5..c4786f55 100644
--- a/mp/src/vpc_scripts/groups.vgc
+++ b/mp/src/vpc_scripts/groups.vgc
@@ -23,10 +23,16 @@ $Group "game"
 	"vgui_controls"
 }
 
+$Group "shaders"
+{
+	"game_shader_dx9"
+}
+
 $Group "everything"
 {
 	"captioncompiler"
 	"client"
+	"game_shader_dx9"
 	"glview"
 	"height2normal"
 	"mathlib"
diff --git a/mp/src/vpc_scripts/projects.vgc b/mp/src/vpc_scripts/projects.vgc
index 649cd85b..9ce86546 100644
--- a/mp/src/vpc_scripts/projects.vgc
+++ b/mp/src/vpc_scripts/projects.vgc
@@ -19,6 +19,11 @@ $Project "client"
 	"game\client\client_hl2mp.vpc"		[($WIN32||$POSIX) && $HL2MP]
 }
 
+$Project "game_shader_dx9"
+{
+	"materialsystem\stdshaders\game_shader_dx9_hl2mp.vpc" [$HL2MP]
+}
+
 $Project "glview"
 {
 	"utils\glview\glview.vpc" [$WIN32]
diff --git a/mp/src/vpc_scripts/source_base.vpc b/mp/src/vpc_scripts/source_base.vpc
index 074b850c..fc70c2e5 100644
--- a/mp/src/vpc_scripts/source_base.vpc
+++ b/mp/src/vpc_scripts/source_base.vpc
@@ -10,8 +10,8 @@
 // This is one file we expect to be different between branches and so it must be merged carefully
 
 // Staging branch:
-//$Macro STAGING_ONLY	"1"
+//$Conditional STAGING_ONLY	"1"
 
 // rel/tf_beta branch:
-//$Macro TF_BETA	"1"
+//$Conditional TF_BETA	"1"
 
diff --git a/mp/src/vpc_scripts/source_dll_win32_base.vpc b/mp/src/vpc_scripts/source_dll_win32_base.vpc
index 77f577e2..4382efaa 100644
--- a/mp/src/vpc_scripts/source_dll_win32_base.vpc
+++ b/mp/src/vpc_scripts/source_dll_win32_base.vpc
@@ -130,7 +130,7 @@ $Project
 				$CustomBuildStep
 				{
 					// General
-					$CommandLine				"$QUOTE$(VCInstallDir)bin\ml.exe$QUOTE /c /Cp /Zi /Fo$QUOTE$(IntDir)\$(InputName).obj$QUOTE $QUOTE$(InputPath)$QUOTE"
+					$CommandLine				"$QUOTE$(VCInstallDir)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"
 				}		
diff --git a/mp/src/vpc_scripts/source_video_base.vpc b/mp/src/vpc_scripts/source_video_base.vpc
index b1baa408..dd7f3653 100644
--- a/mp/src/vpc_scripts/source_video_base.vpc
+++ b/mp/src/vpc_scripts/source_video_base.vpc
@@ -31,7 +31,7 @@
 
 $Macro GL "1" [!$DEDICATED && !$WIN32 && !$WIN64]
 // If we're using OpenGL, we're implicitly using SDL.
-$Macro SDL "1" [$GL && !$OSXALL && !$DEDICATED]
+$Macro SDL "1" [$GL && !$DEDICATED]
 
 $Configuration
 {
@@ -57,5 +57,14 @@ $Configuration
 		$PreprocessorDefinitions		"$BASE;USE_SDL"							[$SDL]
                 $AdditionalIncludeDirectories		"$BASE;$SRCDIR\thirdparty\SDL2"					[$SDL || $DEDICATED]
 	}
+
+}
+
+$Project
+{
+	$Folder "Link Libraries" [$OSXALL && $SDL]
+	{
+		$DynamicFile   "$SRCDIR\lib\public\$PLATFORM\$_IMPLIB_PREFIXSDL2$_IMPLIB_EXT"
+	}
 }
 
diff --git a/mp/src/vpc_scripts/source_win32_base.vpc b/mp/src/vpc_scripts/source_win32_base.vpc
index 8be3bcf6..04ef53b8 100644
--- a/mp/src/vpc_scripts/source_win32_base.vpc
+++ b/mp/src/vpc_scripts/source_win32_base.vpc
@@ -60,10 +60,6 @@ $Configuration
 		$PreprocessorDefinitions			"$BASE;WIN64;_WIN64;COMPILER_MSVC64" [$WIN64]
 		$PreprocessorDefinitions			"$BASE;COMPILER_MSVC32" [$WIN32]
 
-		// The VS 2012 compiler keeps hitting internal compiler errors during /analyze. In order to get these
-		// fixed we need to report them.
-		$AdditionalOptions  "$BASE /errorReport:send" [$ANALYZE]
-
 		// Pass on appropriate branch define to preprocessor
 		$PreprocessorDefinitions		"$BASE;STAGING_ONLY" [$STAGING_ONLY]
 		$PreprocessorDefinitions		"$BASE;TF_BETA" [$TF_BETA]