fix windows build scripts, add windows opus support

.gitignore

@@ -36,3 +36,5 @@ android/
 .ccache/
 waf3*/
 .vscode/
+.depproj/
+source-engine.sln

.gitmodules

@@ -6,4 +6,4 @@
 	url = https://github.com/nillerusr/source-physics
 [submodule "lib"]
 	path = lib
-	url = https://github.com/nillerusr/source-engine-libs
+	url = https://github.com/nillerusr/source-engine-libs.git

bitmap/colorconversion.cpp

@@ -828,7 +828,7 @@ bool ConvertToATIxN(  const uint8 *src, ImageFormat srcImageFormat,
 					  uint8 *dst, ImageFormat dstImageFormat,
 					  int width, int height, int srcStride, int dstStride )
 {
-#if !defined( _X360 ) && !defined( POSIX )
+#if 0
 
 	// from rgb(a) to ATIxN
 	if( srcStride != 0 || dstStride != 0 )
@@ -877,7 +877,7 @@ bool ConvertToDXTLegacy(  const uint8 *src, ImageFormat srcImageFormat,
  						  uint8 *dst, ImageFormat dstImageFormat, 
 					      int width, int height, int srcStride, int dstStride )
 {
-#if !defined( _X360 ) && !defined( POSIX )
+#if 0
 	// from rgb(a) to dxtN
 	if( srcStride != 0 || dstStride != 0 )
 		return false;

bitmap/wscript

@@ -48,8 +48,8 @@ def build(bld):
 
 	libs = []
 	
-	if bld.env.DEST_OS == 'win32':
+	#if bld.env.DEST_OS == 'win32':
-		libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
+	#	libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
 
 	bld.stlib(
 		source   = source,

common/ServerBrowser/blacklisted_server_manager.cpp

@@ -53,12 +53,12 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
 	{
 		const char *pszName = pData->GetString( "name" );
 
-		uint32 ulDate = pData->GetInt( "date" );
+		uint64 ullDate = pData->GetUint64( "date" );
 		if ( bResetTimes )
 		{
 			time_t today;
 			time( &today );
-			ulDate = today;
+			ullDate = (uint64)today;
 		}
 
 		const char *pszNetAddr = pData->GetString( "addr" );
@@ -68,7 +68,7 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
 
 			m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
 			V_strncpy( m_Blacklist[iIdx].m_szServerName, pszName, sizeof( m_Blacklist[iIdx].m_szServerName ) );
-			m_Blacklist[iIdx].m_ulTimeBlacklistedAt = ulDate;
+			m_Blacklist[iIdx].m_ullTimeBlacklistedAt = ullDate;
 			m_Blacklist[iIdx].m_NetAdr.SetFromString( pszNetAddr );
 
 			++count;
@@ -92,7 +92,7 @@ void CBlacklistedServerManager::SaveToFile( const char *pszFilename )
 	{
 		KeyValues *pSubKey = new KeyValues( "server" );
 		pSubKey->SetString( "name", m_Blacklist[i].m_szServerName );
-		pSubKey->SetInt( "date", m_Blacklist[i].m_ulTimeBlacklistedAt );
+		pSubKey->SetUint64( "date", m_Blacklist[i].m_ullTimeBlacklistedAt );
 		pSubKey->SetString( "addr", m_Blacklist[i].m_NetAdr.ToString() );
 		pKV->AddSubKey( pSubKey );
 	}
@@ -120,7 +120,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( gameserveritem_t &se
 
 	time_t today;
 	time( &today );
-	m_Blacklist[iIdx].m_ulTimeBlacklistedAt = today;
+	m_Blacklist[iIdx].m_ullTimeBlacklistedAt = (uint64)today;
 	m_Blacklist[iIdx].m_NetAdr = netAdr;
 	m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
 
@@ -145,7 +145,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
 
 	time_t today;
 	time( &today );
-	m_Blacklist[iIdx].m_ulTimeBlacklistedAt = today;
+	m_Blacklist[iIdx].m_ullTimeBlacklistedAt = (uint64)today;
 
 	m_Blacklist[iIdx].m_NetAdr = netAdr;
 	m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
@@ -157,7 +157,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
 //-----------------------------------------------------------------------------
 // Purpose: Add the given server to the blacklist. Return added server.
 //-----------------------------------------------------------------------------
-blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, uint32 timestamp )
+blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, uint64 timestamp )
 {
 	netadr_t netAdr( netAddressString );
 
@@ -168,7 +168,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
 	int iIdx = m_Blacklist.AddToTail();
 
 	V_strncpy( m_Blacklist[iIdx].m_szServerName, serverName, sizeof( m_Blacklist[iIdx].m_szServerName ) );
-	m_Blacklist[iIdx].m_ulTimeBlacklistedAt = timestamp;
+	m_Blacklist[iIdx].m_ullTimeBlacklistedAt = timestamp;
 	m_Blacklist[iIdx].m_NetAdr = netAdr;
 	m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
 

common/ServerBrowser/blacklisted_server_manager.h

@@ -23,7 +23,7 @@ struct blacklisted_server_t
 {
 	int m_nServerID;
 	char m_szServerName[64];
-	uint32 m_ulTimeBlacklistedAt;
+	uint64 m_ullTimeBlacklistedAt;
 	netadr_t m_NetAdr;
 };
 
@@ -40,7 +40,7 @@ public:
 
 	blacklisted_server_t *AddServer( gameserveritem_t &server );
 	blacklisted_server_t *AddServer( const char *serverName, uint32 serverIP, int serverPort );
-	blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, uint32 timestamp );
+	blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, uint64 timestamp );
 
 	void RemoveServer( int iServerID );		// remove server with matching 'server id' from list
 

datacache/wscript

@@ -20,7 +20,8 @@ def build(bld):
 		'mdlcache.cpp',
 		'../public/studio.cpp',
 		'../public/studio_virtualmodel.cpp',
-		'../common/studiobyteswap.cpp'
+		'../common/studiobyteswap.cpp',
+		'../public/tier0/memoverride.cpp'
 	]
 
 	includes = [

dedicated/wscript

@@ -33,9 +33,10 @@ def build(bld):
 		'../filesystem/filesystem_stdio.cpp',
 		'../filesystem/QueuedLoader.cpp',
 		'../public/zip_utils.cpp',
+		'../public/tier0/memoverride.cpp'
 	]
 
-	if bld.env.DEST_OS == 'win32'
+	if bld.env.DEST_OS == 'win32':
 		source += [
 			'sys_windows.cpp'
 		]

engine/LoadScreenUpdate.cpp

@@ -113,7 +113,7 @@ void EndLoadingUpdates()
 	}
 }
 
-static int LoadLibraryThreadFunc()
+static uintp LoadLibraryThreadFunc(void *pParam)
 {
 	RefreshScreenIfNecessary();
 	return 15;

engine/bugreporter.cpp

@@ -1847,7 +1847,7 @@ void CBugUIPanel::OnSubmit()
 		extern CGlobalVars g_ServerGlobalVariables;
 		char misc2[ 256 ];
 
-		long mapfiletime = g_pFileSystem->GetFileTime( modelloader->GetName( host_state.worldmodel ), "GAME" );
+		time_t mapfiletime = g_pFileSystem->GetFileTime( modelloader->GetName( host_state.worldmodel ), "GAME" );
 		if ( !isPublic && mapfiletime != 0L )
 		{
 			char filetimebuf[ 64 ];

engine/sv_main.cpp

@@ -209,10 +209,11 @@ static ConVar sv_consistency( "sv_consistency", "1", FCVAR_REPLICATED, "Legacy v
 
 /// XXX(JohnS): When steam voice gets ugpraded to Opus we will probably default back to steam.  At that time we should
 ///             note that Steam voice is the highest quality codec below.
-static ConVar sv_voicecodec( "sv_voicecodec", "vaudio_celt", 0,
+static ConVar sv_voicecodec( "sv_voicecodec", "vaudio_opus", 0,
                              "Specifies which voice codec to use. Valid options are:\n"
                              "vaudio_speex - Legacy Speex codec (lowest quality)\n"
                              "vaudio_celt - Newer CELT codec\n"
+							 "vaudio_opus - Latest Opus codec (highest quality, comes by default)\n"
                              "steam - Use Steam voice API" );
 
 

engine/sys_dll2.cpp

@@ -1176,7 +1176,7 @@ InitReturnVal_t CEngineAPI::Init()
 	m_bRunningSimulation = false;
 
 	// Initialize the FPU control word
-#if defined(WIN32) && !defined( SWDS ) && !defined( _X360 ) && !defined (__arm__)
+#if defined(WIN32) && !defined( SWDS ) && !defined( _X360 ) && !defined (__arm__) && !defined(PLATFORM_WINDOWS_PC64)
 	_asm
 	{
 		fninit

engine/sys_mainwind.cpp

@@ -161,7 +161,7 @@ public:
 	void			SetMainWindow( SDL_Window* window );
 #else
 #ifdef WIN32
-	int				WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
+	LRESULT			WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam );
 #endif
 	void			SetMainWindow( HWND window );
 #endif
@@ -514,7 +514,7 @@ void VCR_HandlePlaybackMessages(
 // FIXME: It would be nice to remove the need for this, which we can do
 // if we can make unicode work when running inside hammer.
 //-----------------------------------------------------------------------------
-static LONG WINAPI CallDefaultWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
+static LRESULT WINAPI CallDefaultWindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam )
 {
 	if ( unicode )
 		return unicode->DefWindowProcW( hWnd, uMsg, wParam, lParam );
@@ -575,10 +575,10 @@ void XBX_HandleInvite( DWORD nUserId )
 //-----------------------------------------------------------------------------
 // Main windows procedure
 //-----------------------------------------------------------------------------
-int CGame::WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT CGame::WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 {
-	LONG			lRet = 0;
+	LRESULT			lRet = 0;
 	HDC				hdc;
 	PAINTSTRUCT		ps;
 
@@ -848,7 +848,7 @@ int CGame::WindowProc( HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 //-----------------------------------------------------------------------------
 // Creates the game window 
 //-----------------------------------------------------------------------------
-static LONG WINAPI HLEngineWindowProc( HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM  lParam )
+static LRESULT WINAPI HLEngineWindowProc( HWND hWnd, UINT uMsg, WPARAM  wParam, LPARAM  lParam )
 {
 	return g_Game.WindowProc( hWnd, uMsg, wParam, lParam );
 }
@@ -952,7 +952,7 @@ bool CGame::CreateGameWindow( void )
 	memset( &wc, 0, sizeof( wc ) );
 
     wc.style         = CS_OWNDC | CS_DBLCLKS;
-    wc.lpfnWndProc   = CallDefaultWindowProc;
+    wc.lpfnWndProc   = static_cast<WNDPROC>(CallDefaultWindowProc);
     wc.hInstance     = m_hInstance;
     wc.lpszClassName = CLASSNAME;
 

engine/voice_codecs/celt/wscript

@@ -19,7 +19,8 @@ def build(bld):
 	source = [
 		'voiceencoder_celt.cpp',
 		'../frame_encoder/voice_codec_frame.cpp',
-		'../../../tier1/interface.cpp'
+		'../../../tier1/interface.cpp',
+		'../../../public/tier0/memoverride.cpp'
 	]
 
 	includes = [

engine/voice_codecs/minimp3/wscript

@@ -17,6 +17,7 @@ def configure(conf):
 def build(bld):
 	source = [
 		'mp3codecs.cpp',
+		'../../../public/tier0/memoverride.cpp'
 	]
 
 	includes = [

engine/voice_codecs/opus/wscript

@@ -17,7 +17,8 @@ def build(bld):
 	source = [
 		'voiceencoder_opus.cpp',
 		'../frame_encoder/voice_codec_frame.cpp',
-		'../../../tier1/interface.cpp'
+		'../../../tier1/interface.cpp',
+		'../../../public/tier0/memoverride.cpp'
 	]
 
 	includes = [

engine/voice_codecs/speex/wscript

@@ -19,7 +19,8 @@ def build(bld):
 	source = [
 		'VoiceEncoder_Speex.cpp',
 		'../frame_encoder/voice_codec_frame.cpp',
-		'../../../tier1/interface.cpp'
+		'../../../tier1/interface.cpp',
+		'../../../public/tier0/memoverride.cpp'
 	]
 
 	includes = [

filesystem/basefilesystem.cpp

@@ -42,6 +42,8 @@
 #undef GetCurrentDirectory
 #endif
 
+#include <time.h>
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -2800,7 +2802,7 @@ unsigned int CBaseFileSystem::Size( const char* pFileName, const char *pPathID )
 //			*pFileName - 
 // Output : long
 //-----------------------------------------------------------------------------
-long CBaseFileSystem::FastFileTime( const CSearchPath *path, const char *pFileName )
+time_t CBaseFileSystem::FastFileTime( const CSearchPath *path, const char *pFileName )
 {
 	struct	_stat buf;
 
@@ -3323,7 +3325,7 @@ char *CBaseFileSystem::ReadLine( char *pOutput, int maxChars, FileHandle_t file
 // Input  : *pFileName - 
 // Output : long
 //-----------------------------------------------------------------------------
-long CBaseFileSystem::GetFileTime( const char *pFileName, const char *pPathID )
+time_t CBaseFileSystem::GetFileTime( const char *pFileName, const char *pPathID )
 {
 	VPROF_BUDGET( "CBaseFileSystem::GetFileTime", VPROF_BUDGETGROUP_OTHER_FILESYSTEM );
 
@@ -3340,7 +3342,7 @@ long CBaseFileSystem::GetFileTime( const char *pFileName, const char *pPathID )
 
 	for ( CSearchPath *pSearchPath = iter.GetFirst(); pSearchPath != NULL; pSearchPath = iter.GetNext() )
 	{
-		long ft = FastFileTime( pSearchPath, tempFileName );
+		time_t ft = FastFileTime( pSearchPath, tempFileName );
 		if ( ft != 0L )
 		{
 			if ( !pSearchPath->GetPackFile() && m_LogFuncs.Count() )
@@ -3363,12 +3365,12 @@ long CBaseFileSystem::GetFileTime( const char *pFileName, const char *pPathID )
 			return ft;
 		}
 	}
-	return 0L;
+	return (time_t)0L;
 }
 
-long CBaseFileSystem::GetPathTime( const char *pFileName, const char *pPathID )
+time_t CBaseFileSystem::GetPathTime( const char *pFileName, const char *pPathID )
 {
-	VPROF_BUDGET( "CBaseFileSystem::GetFileTime", VPROF_BUDGETGROUP_OTHER_FILESYSTEM );
+	VPROF_BUDGET( "CBaseFileSystem::GetPathTime", VPROF_BUDGETGROUP_OTHER_FILESYSTEM );
 
 	CSearchPathsIterator iter( this, &pFileName, pPathID );
 
@@ -3379,10 +3381,10 @@ long CBaseFileSystem::GetPathTime( const char *pFileName, const char *pPathID )
 	Q_strlower( tempFileName );
 #endif
 
-	long pathTime = 0L;
+	time_t pathTime = 0L;
 	for ( CSearchPath *pSearchPath = iter.GetFirst(); pSearchPath != NULL; pSearchPath = iter.GetNext() )
 	{
-		long ft = FastFileTime( pSearchPath, tempFileName );
+		time_t ft = FastFileTime( pSearchPath, tempFileName );
 		if ( ft > pathTime )
 			pathTime = ft;
 		if ( ft != 0L )
@@ -3707,7 +3709,7 @@ void CBaseFileSystem::SetWhitelistSpewFlags( int flags )
 //			maxCharsIncludingTerminator - 
 //			fileTime - 
 //-----------------------------------------------------------------------------
-void CBaseFileSystem::FileTimeToString( char *pString, int maxCharsIncludingTerminator, long fileTime )
+void CBaseFileSystem::FileTimeToString( char *pString, int maxCharsIncludingTerminator, time_t fileTime )
 {
 	if ( IsX360() )
 	{

filesystem/basefilesystem.h

@@ -67,6 +67,8 @@
 #include "vpklib/packedstore.h"
 #endif
 
+#include <time.h>
+
 #include "tier0/memdbgon.h"
 
 #ifdef _WIN32
@@ -312,10 +314,10 @@ public:
 	virtual void				MarkPathIDByRequestOnly( const char *pPathID, bool bRequestOnly );
 
 	virtual bool				FileExists( const char *pFileName, const char *pPathID = NULL );
-	virtual long				GetFileTime( const char *pFileName, const char *pPathID = NULL );
+	virtual time_t				GetFileTime( const char *pFileName, const char *pPathID = NULL );
 	virtual bool				IsFileWritable( char const *pFileName, const char *pPathID = NULL );
 	virtual bool				SetFileWritable( char const *pFileName, bool writable, const char *pPathID = 0 );
-	virtual void				FileTimeToString( char *pString, int maxChars, long fileTime );
+	virtual void				FileTimeToString( char *pString, int maxChars, time_t fileTime );
 	
 	virtual const char			*FindFirst( const char *pWildCard, FileFindHandle_t *pHandle );
 	virtual const char			*FindFirstEx( const char *pWildCard, const char *pPathID, FileFindHandle_t *pHandle );
@@ -338,7 +340,7 @@ public:
 	virtual FileNameHandle_t	FindFileName( char const *pFileName );
 	virtual bool				String( const FileNameHandle_t& handle, char *buf, int buflen );
 	virtual int					GetPathIndex( const FileNameHandle_t &handle );
-	long						GetPathTime( const char *pFileName, const char *pPathID );
+	time_t						GetPathTime( const char *pFileName, const char *pPathID );
 	
 	virtual void				EnableWhitelistFileTracking( bool bEnable, bool bCacheAllVPKHashes, bool bRecalculateAndCheckHashes );
 	virtual void				RegisterFileWhitelist( IPureServerWhitelist *pWhiteList, IFileList **ppFilesToReload ) OVERRIDE;
@@ -794,7 +796,7 @@ protected:
 	void						HandleOpenRegularFile( CFileOpenInfo &openInfo, bool bIsAbsolutePath );
 
 	FileHandle_t				FindFileInSearchPath( CFileOpenInfo &openInfo );
-	long						FastFileTime( const CSearchPath *path, const char *pFileName );
+	time_t						FastFileTime( const CSearchPath *path, const char *pFileName );
 
 	const char					*GetWritePath( const char *pFilename, const char *pathID );
 

filesystem/wscript

@@ -15,7 +15,7 @@ def configure(conf):
 	conf.define('FILESYSTEM_STDIO_EXPORTS',1)
 	conf.define('DONT_PROTECT_FILEIO_FUNCTIONS',1)
 #	conf.define('PROTECTED_THINGS_ENABLE',1)
-	conf.define('_USE_32BIT_TIME_T',1)
+#	conf.define('_USE_32BIT_TIME_T',1)
 	conf.define('SUPPORT_PACKED_STORE',1)
 
 def build(bld):

game/client/wscript

@@ -69,12 +69,11 @@ def build(bld):
 	if bld.env.DEST_OS != 'android':
 		install_path += '/'+bld.env.GAMES+'/bin'
 
-	source = [ 'touch.cpp', 'in_touch.cpp' ]
+	source = [ 'in_touch.cpp' ]
 	if bld.env.DEST_OS == 'win32':
-		source += [ '../../public/tier0/memoverride.cpp' ]
 		libs += ['USER32']
 
-	source += game["sources"]
+	source += game["sources"] + ['../../public/tier0/memoverride.cpp']
 	includes += game["includes"]
 	defines = game["defines"]
 

game/server/baseentity.cpp

@@ -3365,7 +3365,7 @@ void CBaseEntity::FunctionCheck( void *pFunction, const char *name )
 	// Note, if you crash here and your class is using multiple inheritance, it is
 	// probably the case that CBaseEntity (or a descendant) is not the first
 	// class in your list of ancestors, which it must be.
-	if (pFunction && !UTIL_FunctionToName( GetDataDescMap(), (inputfunc_t *)pFunction ) )
+	if (pFunction && !UTIL_FunctionToName( GetDataDescMap(), *(inputfunc_t*)pFunction ) )
 	{
 		Warning( "FUNCTION NOT IN TABLE!: %s:%s (%08lx)\n", STRING(m_iClassname), name, (unsigned long)pFunction );
 		Assert(0);

game/server/baseentity.h

@@ -1108,7 +1108,7 @@ public:
 
 	ENTITYFUNCPTR TouchSet( ENTITYFUNCPTR func, char *name ) 
 	{ 
-#ifdef GNUC
+#ifdef PLATFORM_64BITS
 		COMPILE_TIME_ASSERT( sizeof(func) == 8 );
 #else
 		COMPILE_TIME_ASSERT( sizeof(func) == 4 );
@@ -1119,7 +1119,7 @@ public:
 	}
 	USEPTR	UseSet( USEPTR func, char *name ) 
 	{ 
-#ifdef GNUC
+#ifdef PLATFORM_64BITS
 		COMPILE_TIME_ASSERT( sizeof(func) == 8 );
 #else
 		COMPILE_TIME_ASSERT( sizeof(func) == 4 );
@@ -1130,7 +1130,7 @@ public:
 	}
 	ENTITYFUNCPTR	BlockedSet( ENTITYFUNCPTR func, char *name ) 
 	{ 
-#ifdef GNUC
+#ifdef PLATFORM_64BITS
 		COMPILE_TIME_ASSERT( sizeof(func) == 8 );
 #else
 		COMPILE_TIME_ASSERT( sizeof(func) == 4 );

game/server/episodic/ep2_gamestats.cpp

@@ -419,7 +419,7 @@ void CEP2GameStats::Event_SaveGame( void )
 	Q_strlower( name );
 	Q_FixSlashes( name );
 
-	unsigned int uFileTime = filesystem->GetFileTime( name, "GAME" );
+	time_t uFileTime = filesystem->GetFileTime( name, "GAME" );
 	// Latch off previous
 	map->m_SaveGameInfo.Latch( name, uFileTime );
 
@@ -471,7 +471,7 @@ void CEP2GameStats::Event_LoadGame( void )
 	if ( pSaveGameInfo->m_nCurrentSaveFileTime == 0 || 
 		pSaveGameInfo->m_sCurrentSaveFile != name )
 	{
-		unsigned int uFileTime = filesystem->GetFileTime( name, "GAME" );
+		time_t uFileTime = filesystem->GetFileTime( name, "GAME" );
 
 		// Latch off previous
 		StatsLog( "Relatching save game file due to time or filename change (%s : %u)\n", name, uFileTime );

game/server/episodic/ep2_gamestats.h

@@ -13,6 +13,8 @@
 #include "ep1_gamestats.h"
 #include "tier1/utlstring.h"
 
+#include <time.h>
+
 // EP2 Game Stats
 enum Ep2GameStatsVersions_t
 {
@@ -417,7 +419,7 @@ public:
 		{
 		}
 
-		void Latch( char const *pchSaveName, unsigned int uFileTime )
+		void Latch( char const *pchSaveName, time_t uFileTime )
 		{
 			m_pCurrentRecord = &m_Records[ m_Records.AddToTail() ];
 			m_nCurrentSaveFileTime = uFileTime;
@@ -426,7 +428,7 @@ public:
 
 		CUtlVector< SaveGameInfoRecord2_t > m_Records;
 		SaveGameInfoRecord2_t				*m_pCurrentRecord;
-		unsigned int						m_nCurrentSaveFileTime;
+		time_t							m_nCurrentSaveFileTime;
 		CUtlString							m_sCurrentSaveFile;
 	};
 

game/server/h_export.cpp

@@ -28,9 +28,9 @@ HMODULE win32DLLHandle;
 BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
 {
 	// ensure data sizes are stable
-	if ( sizeof(inputfunc_t) != sizeof(int) )
+	if ( sizeof(inputfunc_t) != sizeof(uintp) )
 	{
-		Assert( sizeof(inputfunc_t) == sizeof(int) );
+		Assert( sizeof(inputfunc_t) == sizeof(uintp) );
 		return FALSE;
 	}
 

game/server/hl2/npc_strider.cpp

@@ -3339,9 +3339,9 @@ bool CNPC_Strider::ShouldExplodeFromDamage( const CTakeDamageInfo &info )
 
 //---------------------------------------------------------
 //---------------------------------------------------------
-ConVarRef mat_dxlevel( "mat_dxlevel" );
 bool CNPC_Strider::BecomeRagdoll( const CTakeDamageInfo &info, const Vector &forceVector ) 
 { 
+	static ConVarRef mat_dxlevel( "mat_dxlevel" );
 	// Combine balls make us explode
 	if ( m_bExploding )
 	{

game/server/util.h

@@ -615,7 +615,7 @@ bool UTIL_IsFacingWithinTolerance( CBaseEntity *pViewer, CBaseEntity *pTarget, f
 void UTIL_GetDebugColorForRelationship( int nRelationship, int &r, int &g, int &b );
 
 struct datamap_t;
-extern const char	*UTIL_FunctionToName( datamap_t *pMap, inputfunc_t *function );
+extern const char	*UTIL_FunctionToName( datamap_t *pMap, inputfunc_t function );
 
 int UTIL_GetCommandClientIndex( void );
 CBasePlayer *UTIL_GetCommandClient( void );

game/server/wscript

@@ -63,13 +63,10 @@ def build(bld):
 	if bld.env.DEST_OS != 'android':
 		install_path += '/'+bld.env.GAMES+'/bin'
 
-	source = game["sources"]
+	source = game["sources"] + ['../../public/tier0/memoverride.cpp']
 	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/BasePanel.cpp

@@ -2312,7 +2312,7 @@ bool CBasePanel::IsPromptableCommand( const char *command )
 //-------------------------
 // Purpose: Job wrapper
 //-------------------------
-static unsigned PanelJobWrapperFn( void *pvContext )
+static uintp PanelJobWrapperFn( void *pvContext )
 {
 	CBasePanel::CAsyncJobContext *pAsync = reinterpret_cast< CBasePanel::CAsyncJobContext * >( pvContext );
 

gameui/BaseSaveGameDialog.cpp

@@ -20,6 +20,8 @@
 #include "MouseMessageForwardingPanel.h"
 #include "TGAImagePanel.h"
 
+#include <time.h>
+
 // memdbgon must be the last include file in a .cpp file!!!
 #include "tier0/memdbgon.h"
 
@@ -364,7 +366,7 @@ bool CBaseSaveGameDialog::ParseSaveData( char const *pszFileName, char const *ps
 	Q_strncpy( save.szElapsedTime, szElapsedTime, sizeof(save.szElapsedTime) );
 
 	// Now get file time stamp.
-	long fileTime = g_pFullFileSystem->GetFileTime(pszFileName);
+	time_t fileTime = g_pFullFileSystem->GetFileTime(pszFileName);
 	char szFileTime[32];
 	g_pFullFileSystem->FileTimeToString(szFileTime, sizeof(szFileTime), fileTime);
 	char *newline = strstr(szFileTime, "\n");

gameui/SaveGameBrowserDialog.cpp

@@ -22,6 +22,8 @@
 #include "GameUI_Interface.h"
 #include "vstdlib/random.h"
 
+#include <time.h>
+
 #include "SaveGameBrowserDialog.h"
 
 extern const char *COM_GetModDirectory( void );
@@ -1273,7 +1275,7 @@ bool CSaveGameBrowserDialog::ParseSaveData( char const *pszFileName, char const
 	Q_strncpy( save->szElapsedTime, szElapsedTime, sizeof(save->szElapsedTime) );
 
 	// Now get file time stamp.
-	long fileTime = g_pFullFileSystem->GetFileTime(pszFileName);
+	time_t fileTime = g_pFullFileSystem->GetFileTime(pszFileName);
 	char szFileTime[32];
 	g_pFullFileSystem->FileTimeToString(szFileTime, sizeof(szFileTime), fileTime);
 	char *newline = strstr(szFileTime, "\n");

gameui/wscript

@@ -93,11 +93,11 @@ def build(bld):
 		'OptionsSubPortal.cpp',
 		'OptionsSubVideo.cpp',
 		'OptionsSubVoice.cpp',
+		'../public/tier0/memoverride.cpp',
 	]
 
 	if bld.env.DEST_OS == 'win32':
 		source += [
-			'../public/tier0/memoverride.cpp',
 			'LogoFile.cpp',
 			'ChangeGameDialog.cpp',
 			'OptionsSubHaptics.cpp'

inputsystem/wscript

@@ -1,6 +1,7 @@
 #! /usr/bin/env python
 # encoding: utf-8
 
+from gettext import install
 from waflib import Utils
 import os
 
@@ -20,7 +21,8 @@ def build(bld):
 		'joystick_sdl.cpp',
 		'touch_sdl.cpp',
 		'key_translation.cpp',
-		'steamcontroller.cpp'
+		'steamcontroller.cpp',
+		'../public/tier0/memoverride.cpp'
 	]
 
 	if bld.env.DEST_OS == 'win32':
@@ -44,6 +46,15 @@ def build(bld):
 		
 	install_path = bld.env.LIBDIR
 
+	# Copy SDL2 dependency
+	if bld.env.DEST_OS == 'win32':
+		bld(
+			rule='cp ${SRC} ${TGT}',
+			source='../lib/win32/public/'+bld.env.DEST_CPU+'/SDL2.dll',
+			target='SDL2.dll',
+			install_path=install_path,
+		)
+
 	bld.shlib(
 		source   = source,
 		target   = PROJECT_NAME,

ivp

@@ -1 +1 @@
-Subproject commit bb1b1171af890f285193db6abc07acb126e6e93f
+Subproject commit fb8f2ac922a7f8f758a552ddbe47f1933ffe42b0

launcher/wscript

@@ -19,6 +19,7 @@ def build(bld):
 		'../public/filesystem_init.cpp',
 		'launcher.cpp',
 		'reslistgenerator.cpp',
+		'../public/tier0/memoverride.cpp'
 	]
 
 	if bld.env.DEST_OS == 'android':

lib

@@ -0,0 +1 @@
+Subproject commit 8616692265f85926d6901600716e08c69f60d820