Merge pull request #86 from HappyDOGE/windows

Windows mustdie

.gitignore

@@ -1,14 +1,40 @@
 *.mak
 *.mak.vpc_crc
 *.vpc_crc
+*.vpc.*
 *.project
 *obj_*
 .waf*
 .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
 .DS_Store
 build*/
 android/
 .cache/
 .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

README.md

@@ -4,18 +4,19 @@ Welcome to source engine:)
 Discord: https://discord.gg/hZRB7WMgGw
 
 # Current tasks
+- [x] Windows build support for waf
 - [x] NEON support
 - [x] remove unnecessary dependencies
 - [x] Arm(android) port
 - [x] replace current buildsystem with waf
 - [x] rewrite achivement system( to work without steam )
 - [x] 64-bit support
+- [x] VTF 7.5 support
 - [ ] improve performance
 - [ ] fixing bugs
 - [ ] dxvk-native support
 - [ ] Elbrus port
 - [ ] rewrite serverbrowser to work without steam
-- [ ] Windows build support for waf
 
 
 # [How to Build?](https://github.com/nillerusr/source-engine/wiki/How-to-build)

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/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

@@ -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,

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
 

createallprojects

@@ -1,5 +0,0 @@
-#!/bin/bash
-
-pushd `dirname $0`
-devtools/bin/vpc /f /hl2 +everything /mksln everything
-popd

createallprojects.bat

@@ -1 +0,0 @@
-devtools\bin\vpc.exe /2013 +everything /mksln everything.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"
 

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/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,20 @@ def build(bld):
 		'../filesystem/filesystem_stdio.cpp',
 		'../filesystem/QueuedLoader.cpp',
 		'../public/zip_utils.cpp',
-		'../filesystem/linux_support.cpp' # [$POSIX]
+		'../public/tier0/memoverride.cpp'
 	]
 
+	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',

dx9sdk/lib/DxErr8.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e3a0893326c705d44a13d9263681df9b50a3112f37c45488f5e4919f3b3d26e
-size 1083572

dx9sdk/lib/DxErr9.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0dcf72695c4dc029768d2d8fadb5d61d56dcf896bb9683dc936f8a046c608495
-size 3901404

dx9sdk/lib/XInput.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ef5622f062ea151ea49aee29903562b819bd65c90b052877c127ebcd428895dd
-size 3436

dx9sdk/lib/amstrmid.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11049ebe22f538fd6ca0d6231012c01bf7b867ee181c976fdeba2a666926ae24
-size 272820

dx9sdk/lib/d3d8.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5f410143bdc4fd43a2de62f03837aae135009952c08a1dfef19dcf2d898e75f7
-size 2466

dx9sdk/lib/d3d9.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:461a9baf9d7a3e6ce4b04ef7814296c0fcad36ec77deb7566b361cbdabf6e3d7
-size 4988

dx9sdk/lib/d3dx.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2a7302d67797790fa68dd8c42308621e90971dc71179c702574208b3e56b351f
-size 614522

dx9sdk/lib/d3dx8.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0d5bd10baa80550e2a063e16867723f2fa6a7269a4afef86517a46293958849d
-size 2151212

dx9sdk/lib/d3dx8d.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2b4f081d23b65686c5d0821eb3fb5f3aaf08972f9539a9ce589499700c227c74
-size 53414

dx9sdk/lib/d3dx8dt.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:eddac0b46ac664863136e9c3aa85fa5276e029b8972433fdf1cc40dcc3aefe8f
-size 2467156

dx9sdk/lib/d3dx9.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0b1cd009d5e5ed15080c4d7ad0245a273242da07e0747921e80ac3ccf9bc0fc2
-size 87600

dx9sdk/lib/d3dx9d.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f97e80701a1ed7a4d13bc3315a76512ff9abe7dff595d4dd50c323aaf5147185
-size 82790

dx9sdk/lib/d3dx9dt.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:fd431d9ec65c3d3fd401b89aba77d83551e06ef80dcb725fdc89b8d78e90cf79
-size 6980296

dx9sdk/lib/d3dxd.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2fa2491ea3fc524799b6a66e23b2f10c5f6ac028f1f53f37d53361978ebc9cce
-size 565570

dx9sdk/lib/d3dxof.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e02101d54f570d2bbb985292f4c6f0db105b067d32e865991a698faa78a34e6
-size 1722

dx9sdk/lib/ddraw.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6e9e94271645a16f5dee111cf380eaea1dd03bafcfab676d4198cfd7900de036
-size 4540

dx9sdk/lib/dinput.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6cefbeaf8688ea42259a055f84feec0410a666be6ddfdcc745c2661edeb123da
-size 17790

dx9sdk/lib/dinput8.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:277158fb325b22fd10680779e73b7dec1b2f577c7129ac25f632168325bd4f5e
-size 284368

dx9sdk/lib/dmoguids.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3fdecc54f091efe3f1888879e0f166c753a86984fb5624f96244f7abb45a3bb7
-size 18408

dx9sdk/lib/dplayx.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0ec0bb6a248ddb690ef60d05a8f04003005a1c231e6e4fa42b1b013cca2900aa
-size 3142

dx9sdk/lib/dsetup.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca00eae1ab791a5fd790d5ff88637e0c1572d9e0c2ce519bebf6152555b9004b
-size 5998

dx9sdk/lib/dsound.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14cfc17975a4fa6e4d556f54e428feddfaf18bed92de0d88ff5cec056b12a232
-size 4038

dx9sdk/lib/dxguid.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2980caa0e1508434f235e508774cd04ba10c7307ac1ac6cd9882c27af3d5a905
-size 896294

dx9sdk/lib/dxtrans.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:df37172800688fb7e3f5fdfdb74356dd1b3cf96f832f0853216e5cc77d5eefcf
-size 3700

dx9sdk/lib/encapi.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7e413d10865eb1e926025377cd5f32e4ff43edb24a26ebe3a5c91816575a4991
-size 1522

dx9sdk/lib/ksproxy.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5ec6a36a095d3407c714c400c7b2af4ef99045e259bfa26159a4c54a3da6f55f
-size 3054

dx9sdk/lib/ksuser.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:83637cc3955db5f8603629d2030208f5aeaa0d6d236e31c29d315f64bd25e13a
-size 196016

dx9sdk/lib/msdmo.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6df9d8ce8bff23e0f9dcf5d53e863742c8d349dcc599962f05d2846689eb9431
-size 4620

dx9sdk/lib/quartz.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a794047f31bd85d9672ee9abcadc4dc78d7a13a02727ed1e6ae9f7a31b810919
-size 2370

dx9sdk/lib/strmiids.lib

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11049ebe22f538fd6ca0d6231012c01bf7b867ee181c976fdeba2a666926ae24
-size 272820