Fix Windows build with WAF

.gitignore

@@ -1,6 +1,7 @@
 *.mak
 *.mak.vpc_crc
 *.vpc_crc
+*.vpc.*
 *.project
 *obj_*
 build/
@@ -8,3 +9,24 @@ build/
 .lock-waf*
 __pycache__
 *.pyc
+.vs/
+Debug/
+Debug_*/
+Release/
+Release_*/
+*.tlog/
+*.obj
+*.pch
+*.log
+*.idb
+*.pdb
+*.rc
+*.bin
+*.vcxproj*
+*.sln
+*.dll*
+*.exp
+*.ilk
+ValveETWProviderEvents.h
+game/client/*/client.lib
+game/server/*/server.lib

appframework/wscript

@@ -18,13 +18,24 @@ def build(bld):
 	source = [
 		'AppSystemGroup.cpp',
 		'../public/filesystem_init.cpp',
-#		'vguimatsysapp.cpp'	[$WIN32]
-#		'winapp.cpp'		[$WIN32]
-		'posixapp.cpp',#		[$POSIX]
-		'sdlmgr.cpp'#		[$SDL]
 #		'glmrendererinfo_osx.mm'		[$OSXALL]
 	]
 
+	if bld.env.SDL:
+		source += [
+			'sdlmgr.cpp'
+		]
+
+	if bld.env.DEST_OS == 'win32':
+		source += [
+			'vguimatsysapp.cpp',
+			'winapp.cpp'
+		]
+	else:
+		source += [
+			'posixapp.cpp',#		[$POSIX]
+		]
+
 	includes = [
 		'.',
 		'../public',

bitmap/bitmap.vpc

@@ -15,6 +15,8 @@ $Configuration
 		$AdditionalIncludeDirectories	"$BASE;$SRCDIR\dx9sdk\include"					[$WINDOWS]
 		$AdditionalIncludeDirectories	"$BASE;$SRCDIR\x360xdk\include\win32\vs2005"	[$WINDOWS]
 		$AdditionalIncludeDirectories	"$BASE;$SRCDIR\thirdparty\stb"
+		
+		$PreprocessorDefinitions		"$BASE;NO_X360_XDK;" [!$X360]
 	}
 }
 

bitmap/wscript

@@ -21,7 +21,6 @@ def build(bld):
 		'float_bm.cpp',
 		'float_bm2.cpp',
 		'float_bm3.cpp',
-		 #'float_bm4.cpp',	[$WINDOWS]
 		'float_bm_bilateral_filter.cpp',
 		'float_cube.cpp',
 		'imageformat.cpp',
@@ -31,6 +30,11 @@ def build(bld):
 		'tgawriter.cpp',
 		'bitmap.cpp'
 	]
+	
+	if bld.env.DEST_OS == 'win32':
+		source += [
+			'float_bm4.cpp'
+		]
 
 	includes = [
 		'.',
@@ -43,6 +47,9 @@ def build(bld):
 	defines = []
 
 	libs = []
+	
+	if bld.env.DEST_OS == 'win32':
+		libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
 
 	bld.stlib(
 		source   = source,

creategameprojects.bat

@@ -0,0 +1 @@
+devtools\bin\vpc.exe /2019 +game /hl2 /mksln game.sln

datacache/datacache.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 

dedicated/dedicated.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $include "$SRCDIR\vpc_scripts\source_cryptlib_include.vpc"
@@ -142,6 +142,7 @@ $Project "Dedicated"
 		$Lib	tier2
 		$Lib	tier3
 		$Lib	vgui_controls [$WIN32]
+		$Lib 	vpklib
 		$LibExternal "$SRCDIR/thirdparty/libedit-3.1/src/.libs/libedit" [$LINUXALL]
 		$ImpLibExternal steam_api
 		$ImpLib SDL2 [$SDL]

dedicated/wscript

@@ -24,11 +24,8 @@ def build(bld):
 		'../common/SteamAppStartup.cpp',
 		'sys_common.cpp',
 		'sys_ded.cpp',
-		#'sys_windows.cpp', [$WINDOWS]
-		'sys_linux.cpp', # [$POSIX]
 		'console/conproc.cpp',
 		'console/textconsole.cpp',
-		'console/TextConsoleUnix.cpp', # [$POSIX]
 		'../filesystem/filetracker.cpp',
 		'../filesystem/basefilesystem.cpp',
 		'../filesystem/packfile.cpp',
@@ -36,9 +33,19 @@ def build(bld):
 		'../filesystem/filesystem_stdio.cpp',
 		'../filesystem/QueuedLoader.cpp',
 		'../public/zip_utils.cpp',
-		'../filesystem/linux_support.cpp' # [$POSIX]
 	]
 
+	if bld.env.DEST_OS == 'win32'
+		source += [
+			'sys_windows.cpp'
+		]
+	else:
+		source += [
+			'sys_linux.cpp', # [$POSIX]
+			'console/TextConsoleUnix.cpp', # [$POSIX]
+			'../filesystem/linux_support.cpp' # [$POSIX]
+		]
+
 	includes = [
 		'.',
 		'../public',

engine/audio/private/snd_dev_direct.cpp

@@ -11,7 +11,7 @@
 // Fix for VS 2010 build errors copied from Dota
 #if !defined( NEW_DXSDK ) && ( _MSC_VER >= 1600 )
 #undef KSDATAFORMAT_SUBTYPE_WAVEFORMATEX
-#undef KSDATAFORMAT_SUBTYPE_PCM
+//#undef KSDATAFORMAT_SUBTYPE_PCM
 #undef KSDATAFORMAT_SUBTYPE_IEEE_FLOAT
 #endif
 #include <ksmedia.h>
@@ -46,6 +46,8 @@ typedef enum {SIS_SUCCESS, SIS_FAILURE, SIS_NOTAVAIL} sndinitstat;
 // hack - need to include latest dsound.h
 #undef DSSPEAKER_5POINT1
 #undef DSSPEAKER_7POINT1
+#undef DSSPEAKER_7POINT1_SURROUND
+#undef DSSPEAKER_5POINT1_SURROUND
 #define DSSPEAKER_5POINT1		6
 #define DSSPEAKER_7POINT1		7
 #define DSSPEAKER_7POINT1_SURROUND 8

engine/engine.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $include "$SRCDIR\vpc_scripts\source_replay.vpc"
@@ -1120,7 +1120,7 @@ $Project "engine"
 		// http://code.google.com/p/gperftools/wiki/GooglePerformanceTools
 		$File	"$SRCDIR/thirdparty/gperftools-2.0/.libs/libprofiler.so" [$GPROFILER]
 
-		$Lib	"$LIBCOMMON/binkw32"					[$WIN32&&!$QUICKTIME_WIN32]
+		//$Lib	"$LIBCOMMON/binkw32"					[$WIN32&&!$QUICKTIME_WIN32]
 		$File   "$LIBCOMMON\quicktime\QTMLClient"       [$WIN32&&$QUICKTIME_WIN32]
 		$ImpLib	"SDL2" [$SDL]
 		$File	"$SRCDIR\DX9SDK\lib\dsound.lib" [$WIN32]

engine/voice_codecs/minimp3/vaudio_minimp3.vpc

@@ -6,17 +6,17 @@
 
 
 $Macro SRCDIR           "..\..\.."
-$Macro OUTBINDIR        "$LIBPUBLIC"
+$Macro OUTBINDIR		"$SRCDIR\..\game\bin"
 
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
 $Configuration
 {
-        $Compiler
-        {
-                $AdditionalIncludeDirectories           "$BASE,$SRCDIR\thirdparty\minimp3\,..\..\..\public,..\..\..\public\tier1,..\..,..\..\..\common,..\..\audio\public"
-                $PreprocessorDefinitions                        "$BASE;"
-        }
+	$Compiler
+	{
+		$AdditionalIncludeDirectories           "$BASE,$SRCDIR\thirdparty\minimp3\,..\..\..\public,..\..\..\public\tier1,..\..,..\..\..\common,..\..\audio\public"
+		$DisableSpecificWarnings				"$BASE;4706"
+	}
 }
 
 $Project "vaudio_minimp3"

engine/wscript

@@ -171,7 +171,6 @@ def build(bld):
 		'sys_dll.cpp',
 		'sys_dll2.cpp',
 		'sys_engine.cpp',
-		'sys_linuxwind.cpp', #[$POSIX]
 		'testscriptmgr.cpp',
 		'traceinit.cpp',
 		'../public/vallocator.cpp',
@@ -193,21 +192,34 @@ def build(bld):
 		'EngineSoundServer.cpp',
 		'audio/private/voice_wavefile.cpp',
 		'audio/private/vox.cpp',
-		'audio/private/snd_posix.cpp',	#	[$POSIX]	
-		#'audio/private/snd_dev_direct.cpp',	[$WINDOWS]/
-		#'audio/private/snd_dev_wave.cpp',	[$WINDOWS]/
-		#'audio/private/voice_mixer_controls.cpp', [$WINDOWS]	/
-		#'audio/private/voice_record_dsound.cpp',	[$WINDOWS]	/
 
 		#'audio/private/snd_dev_xaudio.cpp',[$X360]
 		#'audio/private/snd_wave_mixer_xma.cpp',	[$X360]
 
-		'audio/private/snd_dev_sdl.cpp',	#[$SDL && !$OSXALL]
 		#'audio/private/snd_dev_openal.cpp', # [$OSXALL]
 		#'audio/private/snd_dev_mac_audioqueue.cpp',#	[$OSXALL]
 		#'audio/private/voice_record_mac_audioqueue.cpp',	#[$OSXALL]
 	]
 
+	if bld.env.SDL:
+		source += [
+			'audio/private/snd_dev_sdl.cpp'		#[$SDL && !$OSXALL]
+		]
+
+	if bld.env.DEST_OS == 'win32':
+		source += [	
+			'../public/tier0/memoverride.cpp',
+			'audio/private/snd_dev_direct.cpp',
+			'audio/private/snd_dev_wave.cpp',
+			'audio/private/voice_mixer_controls.cpp',
+			'audio/private/voice_record_dsound.cpp',
+		]
+	else:
+		source += [
+			'sys_linuxwind.cpp',
+			'audio/private/snd_posix.cpp',
+		]
+
 	if bld.env.DEDICATED:
 		source += ['cl_null.cpp']
 	else:
@@ -295,8 +307,6 @@ def build(bld):
 			'audio/private/VBRHeader.cpp', #[!$X360]
 			'audio/private/voice.cpp', #[!$X360]
 			'audio/private/voice_sound_engine_interface.cpp', #[!$X360]
-			'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
-			'audio/private/voice_record_openal.cpp', #[$OSXALL||$LINUXALL]
 			'../public/vgui_controls/vgui_controls.cpp',
 			'../common/vgui/vgui_basebudgetpanel.cpp',
 			'../common/vgui/vgui_budgetbargraphpanel.cpp',
@@ -314,6 +324,12 @@ def build(bld):
 			'vgui_vprofpanel.cpp',	
 			'toolframework.cpp'
 		]
+		
+		if bld.env.DEST_OS != 'win32':
+			source += [	
+				'audio/private/voice_mixer_controls_openal.cpp', #[$OSXALL||$LINUXALL]
+				'audio/private/voice_record_openal.cpp' #[$OSXALL||$LINUXALL]
+			]
 
 	includes = [
 		'.',
@@ -332,7 +348,9 @@ def build(bld):
 
 	if bld.env.DEST_OS == 'android':
 		libs += ['SSL', 'CRYPTO'] # android curl was built with openssl
-
+	elif bld.env.DEST_OS == 'win32':
+		libs += ['USER32', 'WINMM', 'WININET', 'DSOUND', 'DXGUID', 'GDI32', 'bzip2']
+		
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(

external/vpc/tier0/threadtools.cpp

@@ -49,7 +49,7 @@
 #endif
 
 #ifndef _PS3
-#include <memory.h>
+#include <memory>
 #endif
 #include "tier0/threadtools.h"
 

external/vpc/utils/vpc/main.cpp

@@ -75,7 +75,7 @@ CVPC::CVPC()
 	}
 
 #ifdef WIN32
-	m_eVSVersion = k_EVSVersion_2015;
+	m_eVSVersion = k_EVSVersion_2019;
 	m_bUseVS2010FileFormat = true;
 	m_bUseUnity = false;
 #else
@@ -175,11 +175,6 @@ void CVPC::Shutdown( bool bHasError )
 	UnloadPerforceInterface();
 }
 
-#if defined( STANDALONE_VPC )
-class CP4;
-extern CP4 s_p4;
-#endif
-
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 bool CVPC::LoadPerforceInterface()
@@ -190,11 +185,6 @@ bool CVPC::LoadPerforceInterface()
 		return true;
 	}
 
-#if defined( STANDALONE_VPC )
-	p4 = (IP4*)&s_p4;
-	return (p4 != NULL);
-#else
-
 	//
 	// Try to load p4lib.dll and the filesystem since the p4lib relies on it
 	//
@@ -234,7 +224,6 @@ bool CVPC::LoadPerforceInterface()
 	p4->Connect( Sys_GetFactory( m_pFilesystemModule ) );
 
 	return true;
-#endif
 }
 
 //-----------------------------------------------------------------------------
@@ -635,7 +624,8 @@ void CVPC::SpewUsage( void )
 			Log_Msg( LOG_VPC, "[/srcctl]:     Enable P4SCC source control integration - can also set environment variable VPC_SRCCTL to 1\n" );
 #endif
 			Log_Msg( LOG_VPC, "[/mirror]:     <path> - Mirror output files to specified path. Used for A:B testing.\n" );
-			Log_Msg( LOG_VPC, "[/2015]:       Generate projects and solutions for Visual Studio 2015 [default]\n" );
+			Log_Msg( LOG_VPC, "[/2019]:       Generate projects and solutions for Visual Studio 2019 [default]\n" );
+			Log_Msg( LOG_VPC, "[/2015]:       Generate projects and solutions for Visual Studio 2015\n" );
 			Log_Msg( LOG_VPC, "[/2013]:       Generate projects and solutions for Visual Studio 2013\n" );
 			Log_Msg( LOG_VPC, "[/2012]:       Generate projects and solutions for Visual Studio 2012\n" );
 			Log_Msg( LOG_VPC, "[/2010]:       Generate projects and solutions for Visual Studio 2010\n" );
@@ -1004,6 +994,11 @@ void CVPC::HandleSingleCommandLineArg( const char *pArg )
 			m_eVSVersion = k_EVSVersion_2015;
 			m_ExtraOptionsCRCString += pArgName;
 		}
+		else if ( !V_stricmp( pArgName, "2019" ) )
+		{
+			m_eVSVersion = k_EVSVersion_2019;
+			m_ExtraOptionsCRCString += pArgName;
+		}
 		else if ( !V_stricmp( pArgName, "nounity" ) )
 		{
 			m_bUseUnity = false;
@@ -1825,6 +1820,16 @@ void CVPC::SetMacrosAndConditionals()
 		// VS2010 is strictly win32/xbox360
 		switch ( m_eVSVersion )
 		{
+		case k_EVSVersion_2019:
+			m_ExtraOptionsCRCString += "VS2019";
+			SetConditional( "VS2019", true );
+
+			// temporarily allow VS2013 conditionals also as there are many. Will fix.
+			SetConditional( "VS2013", true );
+
+			m_bUseVS2010FileFormat = true;
+			break;
+
 		case k_EVSVersion_2015:
 			m_ExtraOptionsCRCString += "VS2015";
 			SetConditional( "VS2015", true );
@@ -2362,7 +2367,9 @@ void CVPC::SetupGenerators()
 		{
 			// spew what we are generating
 			const char *pchLogLine = "Generating for Visual Studio 2005.\n";
-			if ( m_eVSVersion == k_EVSVersion_2015 )
+			if ( m_eVSVersion == k_EVSVersion_2019 )
+				pchLogLine = "Generating for Visual Studio 2019.\n";
+			else if ( m_eVSVersion == k_EVSVersion_2015 )
 				pchLogLine = "Generating for Visual Studio 2015.\n";
 			else if ( m_eVSVersion == k_EVSVersion_2013 )
 				pchLogLine = "Generating for Visual Studio 2013.\n";

external/vpc/utils/vpc/solutiongenerator_win32.cpp

@@ -27,6 +27,12 @@ class CSolutionGenerator_Win32 : public IBaseSolutionGenerator
 public:
 	void GetVCPROJSolutionGUID( char (&szSolutionGUID)[256] )
 	{
+		if ( g_pVPC->Is2019() )
+		{
+			V_strncpy( szSolutionGUID, "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}", ARRAYSIZE(szSolutionGUID) );
+			return;
+		}
+
 		HKEY hKey;
 		int firstVer = 8;
 		const int lastVer = 14; // Handle up to VS 14, AKA VS 2015
@@ -114,7 +120,12 @@ public:
 			g_pVPC->VPCError( "Can't open %s for writing.", pSolutionFilename );
 
 		
-		if ( g_pVPC->Is2015() )
+		if ( g_pVPC->Is2019() )
+		{
+			fprintf( fp, "\xef\xbb\xbf\nMicrosoft Visual Studio Solution File, Format Version 12.00\n" );
+			fprintf( fp, "# Visual Studio Version 16\n" );
+		}
+		else if ( g_pVPC->Is2015() )
 		{
 			fprintf( fp, "\xef\xbb\xbf\nMicrosoft Visual Studio Solution File, Format Version 12.00\n" ); // still on 12
 			fprintf( fp, "# Visual Studio 2015\n" );

external/vpc/utils/vpc/vpc.h

@@ -182,6 +182,7 @@ enum EVSVersion
 	k_EVSVersion_2012,
 	k_EVSVersion_2013,
 	k_EVSVersion_2015,
+	k_EVSVersion_2019,
 };
 
 class CVPC
@@ -218,6 +219,7 @@ public:
 	bool		Is2012()				{ return m_eVSVersion == k_EVSVersion_2012; }	// When this returns true so does Is2010() because of the file format similarities
 	bool		Is2013()				{ return m_eVSVersion == k_EVSVersion_2013; }	// When this returns true so does Is2010() because of the file format similarities
 	bool		Is2015()				{ return m_eVSVersion == k_EVSVersion_2015; }	// When this returns true so does Is2010() because of the file format similarities
+	bool		Is2019()				{ return m_eVSVersion == k_EVSVersion_2019; }	// When this returns true so does Is2010() because of the file format similarities
 	bool		BUse2008()				{ return m_eVSVersion == k_EVSVersion_2008; }
 	bool		IsDedicatedBuild()		{ return m_bDedicatedBuild;	}
 	bool		IsUnity()				{ return m_bUseUnity; }

external/vpc/utils/vpc/vpc.vcxproj

@@ -13,21 +13,21 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{36C5F545-588F-4091-B480-89E03EDBDA93}</ProjectGuid>
     <RootNamespace>vpc</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>NotSet</CharacterSet>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -58,9 +58,8 @@
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
-      <Command>p4 edit ..\..\..\..\devtools\bin\vpc.exe &amp;&amp; copy /y $(TargetPath) ..\..\..\..\devtools\bin\vpc.exe
-p4 edit ..\..\..\..\devtools\bin\vpc.pdb &amp;&amp; copy /y $(TargetDir)\vpc.pdb ..\..\..\..\devtools\bin\vpc.pdb
-</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -83,14 +82,12 @@ p4 edit ..\..\..\..\devtools\bin\vpc.pdb &amp;&amp; copy /y $(TargetDir)\vpc.pdb
       <SubSystem>Console</SubSystem>
     </Link>
     <PostBuildEvent>
-      <Command>p4 edit ..\..\..\..\devtools\bin\vpc.exe &amp;&amp; copy /y $(TargetPath) ..\..\..\..\devtools\bin\vpc.exe
-p4 edit ..\..\..\..\devtools\bin\vpc.pdb &amp;&amp; copy /y $(TargetDir)\vpc.pdb ..\..\..\..\devtools\bin\vpc.pdb
-</Command>
+      <Command>
+      </Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\interfaces\interfaces.cpp" />
-    <ClCompile Include="..\..\p4lib\p4.cpp" />
     <ClCompile Include="..\..\tier0\assert_dialog.cpp" />
     <ClCompile Include="..\..\tier0\commandline.cpp" />
     <ClCompile Include="..\..\tier0\cpu.cpp" />

external/vpc/utils/vpc/vpc.vcxproj.filters

@@ -245,9 +245,6 @@
     <ClCompile Include="solutiongenerator_codelite.cpp">
       <Filter>VPC\Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\p4lib\p4.cpp">
-      <Filter>Dependencies\Source Files</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\tier0\mem_helpers.h">

filesystem/filesystem_stdio.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $include "$SRCDIR\vpc_scripts\source_cryptlib_include.vpc"

filesystem/filesystem_steam.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR           ".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 

filesystem/wscript

@@ -28,10 +28,14 @@ def build(bld):
 		'../public/kevvaluescompiler.cpp',
 		'../public/zip_utils.cpp',
 		'QueuedLoader.cpp',
-		'linux_support.cpp', #			[$POSIX]
 		'../public/tier0/memoverride.cpp'
 	]
 
+	if bld.env.DEST_OS != 'win32':
+		source += [
+			'linux_support.cpp'
+		]
+
 	includes = [
 		'.',
 		'../public',
@@ -43,6 +47,9 @@ def build(bld):
 	defines = []
 
 	libs = ['tier0','tier1','tier2','vstdlib','vpklib']
+	
+	if bld.env.DEST_OS == 'win32':
+		libs += ['SHELL32']
 
 	install_path = bld.env.LIBDIR
 

game/client/c_baseentity.cpp

@@ -4761,7 +4761,7 @@ C_BaseEntity *C_BaseEntity::Instance( int iEnt )
 
 #ifdef WIN32
 #pragma warning( push )
-#include <typeinfo.h>
+#include <typeinfo>
 #pragma warning( pop )
 #endif
 

game/client/client_base.vpc

@@ -16,7 +16,6 @@ $MacroRequired "GAMENAME"
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc"
 $Include "$SRCDIR\vpc_scripts\source_replay.vpc"	[$TF]
-$Include "$SRCDIR\game\protobuf_include.vpc"
 
 $Configuration	"Debug"
 {
@@ -506,6 +505,8 @@ $Project
 		$File	"$SRCDIR\public\haptics\haptic_msgs.cpp"	[!$X360]
 		$File	"$SRCDIR\public\haptics\haptic_utils.cpp"	[$WIN32&&!$X360]
 
+		$File	"$SRCDIR\game\client\touch.cpp"
+
 		$Folder	"Sixense"
 		{
 			$File	"sixense\in_sixense.cpp"

game/client/client_hl2.vpc

@@ -9,7 +9,6 @@ $Macro GAMENAME 	"hl2" [!$SOURCESDK]
 $Macro GAMENAME 	"mod_hl2" [$SOURCESDK]
 
 $Include "$SRCDIR\game\client\client_base.vpc"
-$Include "$SRCDIR\game\protobuf_include.vpc"
 
 $Configuration
 {

game/client/client_tf.vpc

@@ -15,6 +15,7 @@ $include "$SRCDIR\game\shared\tf\tf_gcmessages_include.vpc"
 $Include "$SRCDIR\game\client\client_econ_base.vpc"
 $Include "$SRCDIR\vpc_scripts\source_saxxyawards.vpc"
 $Include "$SRCDIR\utils\itemtest_lib\itemtest_lib_support.vpc" [$WORKSHOP_IMPORT_ENABLE]
+$Include "$SRCDIR\game\protobuf_include.vpc"
 
 $Configuration
 {

game/client/hud_pdump.cpp

@@ -22,7 +22,7 @@ static CPDumpPanel *g_pPDumpPanel = NULL;
 //  retaining our own warning setup...ywb
 #ifdef WIN32
 #pragma warning( push )
-#include <typeinfo.h>
+#include <typeinfo>
 #pragma warning( pop )
 #endif
 

game/client/interpolatedvar.h

@@ -283,7 +283,7 @@ struct CInterpolatedVarEntryBase<Type, false>
 	{
 		Assert(maxCount==1);
 	}
-	Type *NewEntry( Type *pValue, int maxCount, float time )
+	Type *NewEntry( const Type *pValue, int maxCount, float time )
 	{
 		Assert(maxCount==1);
 		changetime = time;

game/client/particlemgr.h

@@ -120,7 +120,7 @@ entities. Each one is useful under different conditions.
 #include "utllinkedlist.h"
 #include "utldict.h"
 #ifdef WIN32
-#include <typeinfo.h>
+#include <typeinfo>
 #else
 #include <typeinfo>
 #endif

game/client/physics_main_client.cpp

@@ -7,7 +7,7 @@
 #include "cbase.h"
 #include "c_baseentity.h"
 #ifdef WIN32
-#include <typeinfo.h>
+#include <typeinfo>
 #endif
 #include "tier0/vprof.h"
 

game/client/touch.cpp

@@ -1,5 +1,5 @@
+#include "cbase.h"
 #include "convar.h"
-#include <dlfcn.h>
 #include <string.h>
 #include "vgui/IInputInternal.h"
 #include "VGuiMatSurface/IMatSystemSurface.h"
@@ -234,24 +234,26 @@ CON_COMMAND( touch_toggleselection, "toggle visibility on selected button in edi
 void CTouchControls::Init()
 {
 	m_bHaveAssets = true;
+#ifndef _WIN32
 	if( getAssets() == 0 )
 	{
 		m_bHaveAssets = false;
 		base_textureID = vgui::surface()->CreateNewTextureID(true);
 		vgui::surface()->DrawSetTextureRGBA( base_textureID, base_img_rgba, 120, 96, 0, true );
 	}
+#endif
 
 	int w,h;
 	engine->GetScreenSize( w, h );
 	screen_w = w; screen_h = h;
 
-	Msg("grid_x: %f, grid_y: %x\n", GRID_X, GRID_Y);
+	Msg("grid_x: %f, grid_y: %f\n", GRID_X, GRID_Y);
 	configchanged = false;
 	config_loaded = false;
 	btns.EnsureCapacity( 64 );
 	look_finger = move_finger = resize_finger = -1;
 	forward = side = 0;
-	scolor = rgba_t( -1, -1, -1, -1 );
+	scolor = rgba_t( 255, 255, 255, 255 );
 	state = state_none;
 	swidth = 1;
 	move_button = edit = selection = NULL;
@@ -776,7 +778,6 @@ void CTouchControls::WriteConfig()
 
 	if( f )
 	{
-		CTouchButton *button;
 		filesystem->FPrintf( f, "//=======================================================================\n");
 		filesystem->FPrintf( f, "//\t\t\ttouchscreen config\n" );
 		filesystem->FPrintf( f, "//=======================================================================\n" );

game/client/wscript

@@ -66,8 +66,11 @@ def build(bld):
 	if bld.env.DEST_OS != 'android':
 		install_path += '/'+bld.env.GAMES+'/bin'
 
-	source = [ 'touch.cpp', 'arch.c' ]
-
+	source = [ 'arch.c' ]
+	if bld.env.DEST_OS == 'win32':
+		source += [ '../../public/tier0/memoverride.cpp' ]
+		libs += ['USER32']
+		
 	if bld.env.DEST_OS == 'android':
 		source += [
 			'third/minizip/mz_zip.c',

game/server/physics_main.cpp

@@ -8,7 +8,7 @@
 
 #include "cbase.h"
 #ifdef _WIN32
-#include "typeinfo.h"
+#include "typeinfo"
 // BUGBUG: typeinfo stomps some of the warning settings (in yvals.h)
 #pragma warning(disable:4244)
 #elif POSIX

game/server/server_base.vpc

@@ -16,7 +16,6 @@ $MacroRequired "GAMENAME"
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $include "$SRCDIR\vpc_scripts\protobuf_builder.vpc"
 $Include "$SRCDIR\vpc_scripts\source_replay.vpc"	[$TF]
-$Include "$SRCDIR\game\protobuf_include.vpc"
 
 $Configuration	"Debug"
 {

game/server/server_tf.vpc

@@ -11,6 +11,7 @@ $Include "$SRCDIR\game\server\server_base.vpc"
 $Include "$SRCDIR\game\server\server_econ_base.vpc"
 $include "$SRCDIR\game\shared\tf\tf_gcmessages_include.vpc"
 $Include "$SRCDIR\game\server\nav_mesh.vpc"
+$Include "$SRCDIR\game\protobuf_include.vpc"
 
 $Configuration
 {

game/server/wscript

@@ -54,6 +54,8 @@ def build(bld):
 	defines = []
 
 	libs = ['tier0','particles','dmxloader','tier1','tier2','tier3','mathlib','vstdlib','choreoobjects','steam_api']
+	if bld.env.DEST_OS == 'win32':
+		libs += ['USER32']
 
 	install_path = bld.env.PREFIX
 	if bld.env.DEST_OS != 'android':
@@ -63,6 +65,9 @@ def build(bld):
 	includes += game["includes"]
 	defines = game["defines"]
 
+	if bld.env.DEST_OS == 'win32':
+		source += ['../../public/tier0/memoverride.cpp']
+
 	defines.remove('PROTECTED_THINGS_ENABLE')
 
 	bld.shlib(

gameui/GameUI.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 $Include "$SRCDIR\vpc_scripts\source_saxxyawards.vpc"
@@ -246,8 +246,8 @@ $Project "GameUI"
 		$Lib	vtf
 		$Lib  	"$LIBCOMMON/libjpeg"		[!$DEDICATED]
 		$ImpLib	steam_api
-		$Lib libpng [!$VS2015&&!$DEDICATED]
-		$Lib $LIBCOMMON/libpng [$VS2015&&!$DEDICATED]
+		$Lib libpng [!$VS2015 && !$VS2019 && !$DEDICATED]
+		$Lib $LIBCOMMON/libpng [($VS2015 || $VS2019) && !$DEDICATED]
 		$Lib libz [!$DEDICATED]
 		$ImpLib SDL2 [$SDL]
 	}

gameui/wscript

@@ -21,7 +21,6 @@ def build(bld):
 		'BasePanel.cpp',
 		'GameConsole.cpp',
 		'GameUI_Interface.cpp',
-		# 'LogoFile.cpp', [!$POSIX]
 		'ModInfo.cpp',
 		'MouseMessageForwardingPanel.cpp',
 		'../common/GameUI/ObjectList.cpp',
@@ -66,7 +65,6 @@ def build(bld):
 		'LoadCommentaryDialog.cpp',
 		'LoadingDialog.cpp',
 		'BaseSaveGameDialog.cpp',
-		#'ChangeGameDialog.cpp', [!$POSIX]
 		'CreateMultiplayerGameBotPage.cpp',
 		'CreateMultiplayerGameDialog.cpp',
 		'CreateMultiplayerGameGameplayPage.cpp',
@@ -87,7 +85,6 @@ def build(bld):
 		'OptionsSubAudio.cpp',
 		'OptionsSubDifficulty.cpp',
 		'OptionsSubGame.cpp',
-		#'OptionsSubHaptics.cpp',	[$WIN32]	[$WIN32]
 		'OptionsSubKeyboard.cpp',
 		'OptionsSubMouse.cpp',
 		'OptionsSubMultiplayer.cpp',
@@ -96,6 +93,14 @@ def build(bld):
 		'OptionsSubVoice.cpp',
 	]
 
+	if bld.env.DEST_OS == 'win32':
+		source += [
+			'../public/tier0/memoverride.cpp',
+			'LogoFile.cpp',
+			'ChangeGameDialog.cpp',
+			'OptionsSubHaptics.cpp'
+		]
+
 	includes = [
 		'.',
 		'../public',
@@ -109,6 +114,9 @@ def build(bld):
 
 	libs = ['tier0','vgui_controls','tier1','tier2','tier3','vstdlib','vtf','bitmap','mathlib','SDL2','steam_api','matsys_controls','JPEG','PNG','ZLIB']
 
+	if bld.env.DEST_OS == 'win32':
+		libs += ['USER32', 'GDI32']
+		
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(

inputsystem/inputsystem.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 
@@ -13,7 +13,7 @@ $Configuration
 {
 	$Compiler
 	{
-		$AdditionalIncludeDirectories		"$BASE;$SRCDIR\thirdparty\SDL2"	[!$SDL] // If $SDL, then we already have this from source_video_base.vpc.
+		$AdditionalIncludeDirectories		"$BASE;$SRCDIR\thirdparty\SDL"	[!$SDL] // If $SDL, then we already have this from source_video_base.vpc.
 		$PreprocessorDefinitions			"$BASE;VERSION_SAFE_STEAM_API_INTERFACES" 
 	}
 	$Linker
@@ -34,6 +34,7 @@ $Project "inputsystem"
 		$File	"key_translation.cpp"
 		$File	"key_translation.h"
 		$File	"steamcontroller.cpp"
+		$File	"touch_sdl.cpp"
 	}
 
 	$Folder	"Public Headers"

inputsystem/wscript

@@ -19,11 +19,15 @@ def build(bld):
 		'inputsystem.cpp',
 		'joystick_sdl.cpp',
 		'touch_sdl.cpp',
-		#'novint.cpp', #			[$WIN32]
 		'key_translation.cpp',
 		'steamcontroller.cpp'
 	]
 
+	if bld.env.DEST_OS == 'win32':
+		source += [
+			'novint.cpp'
+		]
+
 	includes = [
 		'.',
 		'../common',
@@ -35,6 +39,9 @@ def build(bld):
 
 	libs = ['tier0','tier1','tier2','vstdlib','SDL2','steam_api']
 
+	if bld.env.DEST_OS == 'win32':
+		libs += ['USER32']
+		
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(

launcher/launcher.cpp

@@ -1187,7 +1187,7 @@ extern void InitGL4ES();
 // Output : int APIENTRY
 //-----------------------------------------------------------------------------
 #ifdef WIN32
-extern "C" __declspec(DLL_EXPORT) int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
+DLL_EXPORT int LauncherMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
 #else
 DLL_EXPORT int LauncherMain( int argc, char **argv )
 #endif

launcher/launcher.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 

launcher/wscript

@@ -19,9 +19,13 @@ def build(bld):
 		'../public/filesystem_init.cpp',
 		'launcher.cpp',
 		'reslistgenerator.cpp',
-		'android.cpp'
 	]
 
+	if bld.env.DEST_OS == 'android':
+		source += [
+			'android.cpp'
+		]
+
 	includes = [
 		'.',
 		'../public',
@@ -33,6 +37,9 @@ def build(bld):
 	defines = []
 
 	libs = ['tier0','tier1','tier2','tier3','vstdlib','steam_api','appframework','SDL2','togl']
+	
+	if bld.env.DEST_OS == 'win32':
+		libs += ['USER32', 'OLE32', 'SHELL32']
 
 	install_path = bld.env.LIBDIR
 

launcher_main/launcher_main.vpc

@@ -62,15 +62,13 @@ $Configuration
 		// Note that the PDB must be checked in with the name it is linked as or else the debugger
 		// will not be able to find it. That's why it is checked in as default.pdb.
 		// override with specific behavior
-		$CommandLine				"call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.exe $SRCDIR" "\n" \
-									"call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\default.pdb $SRCDIR" "\n" \
-									"copy $(TargetPath) $OUTBINDIR\hl2.exe" "\n"					\
+		$CommandLine				"copy $(TargetPath) $OUTBINDIR\hl2.exe" "\n"					\
 									"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
 									"copy $(TargetDir)\default.pdb $OUTBINDIR\default.pdb" "\n"					\
 									"if ERRORLEVEL 1 goto BuildEventFailed" "\n" \
 									"if exist $(TargetDir)$(TargetName).map copy $(TargetDir)$(TargetName).map $OUTBINDIR\hl2.map" "\n" \
-									"call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.dat $SRCDIR" "\n"								\
-									"$OUTBINDIR\bin\newdat $OUTBINDIR\hl2.exe" "\n"					\
+									//"call $SRCDIR\vpc_scripts\valve_p4_edit.cmd $OUTBINDIR\hl2.dat $SRCDIR" "\n"								\
+									//"$OUTBINDIR\bin\newdat $OUTBINDIR\hl2.exe" "\n"					\
 									"goto BuildEventOK" "\n" \
 									":BuildEventFailed" "\n" \
 									"echo *** ERROR! PostBuildStep FAILED for $(ProjectName)! EXE or DLL is probably running. ***" "\n" \

materialsystem/mat_stub.h

@@ -76,7 +76,7 @@ public:
 	// Texture streaming!
 	virtual ResidencyType_t GetCurrentResidence() const { return RESIDENT_NONE; };
 	virtual ResidencyType_t GetTargetResidence() const { return RESIDENT_NONE; };
-	virtual bool MakeResident( ResidencyType_t newResidence ) {};
+	virtual bool MakeResident( ResidencyType_t newResidence ) { return false; };
 	virtual void UpdateLodBias() {};
 
 	// Various texture polling methods

materialsystem/materialsystem.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		".."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 

materialsystem/shaderapidx9/shaderapidx10.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 $Include "$SRCDIR\vpc_scripts\source_dll_base.vpc"
 

materialsystem/shaderapidx9/shaderapidx8.cpp

@@ -3499,7 +3499,7 @@ void CShaderAPIDx8::ResetRenderState( bool bFullReset )
 	SetRenderState( D3DRS_CULLMODE, D3DCULL_CCW );
 
 	// No shade mode yet
-	m_DynamicState.m_ShadeMode = NULL;
+	m_DynamicState.m_ShadeMode = (D3DSHADEMODE)NULL;
 	ShadeMode( SHADER_SMOOTH );
 
 	m_DynamicState.m_bHWMorphingEnabled = false;

materialsystem/shaderapidx9/shaderapidx9.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 $Macro OUTBINNAME	"shaderapidx9"
 
 $include "$SRCDIR\vpc_scripts\source_dll_base.vpc"

materialsystem/shaderapidx9/wscript

@@ -18,9 +18,13 @@ def configure(conf):
 		#'PROTECTED_THINGS_ENABLE', # conflicts with stlport
 		'strncpy=use_Q_strncpy_instead',
 		'_snprintf=use_Q_snprintf_instead',
-		'GL_GLEXT_PROTOTYPES',
-		'DX_TO_GL_ABSTRACTION'
 	])
+	
+	if conf.env.DEST_OS == 'win32' and not conf.env.GL:
+		conf.env.append_unique('DEFINES',[
+			'USE_ACTUAL_DX',
+		])
+
 
 def build(bld):
 	source = [
@@ -29,7 +33,6 @@ def build(bld):
 		'hardwareconfig.cpp',
 		'meshbase.cpp',
 		'meshdx8.cpp',
-		#'recording.cpp',								[$WIN32 && !$GL]
 		'shaderapidx8.cpp',
 		'shaderdevicebase.cpp',
 		'shaderapibase.cpp',
@@ -40,11 +43,20 @@ def build(bld):
 		'cvballoctracker.cpp',
 		'vertexdecl.cpp',
 		'vertexshaderdx8.cpp',
-		#'wmi.cpp',									[$WIN32 && !$GL]
 		#'textureheap.cpp',							[$X360]
-		'winutils.cpp'#							[!$WIN32]
 	]
 
+	if bld.env.DEST_OS == 'win32' and not bld.env.GL:
+		source += [
+			'recording.cpp',
+			'wmi.cpp'
+		]
+		
+	if bld.env.DEST_OS != 'win32':
+		source += ['winutils.cpp']
+	else:
+		source += ['../../public/tier0/memoverride.cpp']
+
 	includes = [
 		'.',
 		'../../public',
@@ -60,7 +72,9 @@ def build(bld):
 
 	if bld.env.DEST_OS == 'android':
 		libs += ['ANDROID_SUPPORT']
-
+	elif bld.env.DEST_OS == 'win32' and not bld.env.GL:
+		libs += ['D3D9', 'D3DX9', 'bzip2']
+	
 	install_path = bld.env.LIBDIR
 
 	bld.shlib(

materialsystem/shadersystem.cpp

@@ -447,7 +447,8 @@ extern "C"
 
 void CShaderSystem::VerifyBaseShaderDLL( CSysModule *pModule )
 {
-#if defined( _WIN32 ) && !defined( _X360 )
+//#if defined( _WIN32 ) && !defined( _X360 )
+#if 0
 	const char *pErrorStr = "Corrupt save data settings.";
 
 	unsigned char *testData1 = new unsigned char[SHADER_DLL_VERIFY_DATA_LEN1];

materialsystem/stdshaders/stdshader_dbg.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't
 // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned.

materialsystem/stdshaders/stdshader_dx6.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't
 // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned.

materialsystem/stdshaders/stdshader_dx7.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't
 // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned.

materialsystem/stdshaders/stdshader_dx8.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't
 // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned.

materialsystem/stdshaders/stdshader_dx9.vpc

@@ -5,7 +5,7 @@
 //-----------------------------------------------------------------------------
 
 $Macro SRCDIR		"..\.."
-$Macro OUTBINDIR	"$LIBPUBLIC"
+$Macro OUTBINDIR	"$SRCDIR\..\game\bin"
 
 // shader_dll_verify.cpp defines a function called _ftol3. This means that we can't
 // link with the bug-fixed ftol3.obj. It also means we can't convert float-to-unsigned.

materialsystem/wscript

@@ -47,6 +47,9 @@ def build(bld):
 		'ctexturecompositor.cpp'
 	]
 
+	if bld.env.DEST_OS == 'win32':
+		source += ['../public/tier0/memoverride.cpp']
+
 	includes = [
 		'.',
 		'../../public',