mirror of
https://github.com/nillerusr/source-engine.git
synced 2026-08-07 17:29:36 +00:00
fix windows build scripts, add windows opus support
This commit is contained in:
@@ -67,9 +67,9 @@ int __cdecl BlacklistedAtCompare(ListPanel *pPanel, const ListPanelItem &p1, con
|
||||
if ( !pSvr1 && !pSvr2 )
|
||||
return 0;
|
||||
|
||||
if ( pSvr1->m_ulTimeBlacklistedAt > pSvr2->m_ulTimeBlacklistedAt )
|
||||
if ( pSvr1->m_ullTimeBlacklistedAt > pSvr2->m_ullTimeBlacklistedAt )
|
||||
return -1;
|
||||
if ( pSvr1->m_ulTimeBlacklistedAt < pSvr2->m_ulTimeBlacklistedAt )
|
||||
if ( pSvr1->m_ullTimeBlacklistedAt < pSvr2->m_ullTimeBlacklistedAt )
|
||||
return 1;
|
||||
|
||||
return 0;
|
||||
@@ -148,19 +148,19 @@ bool CBlacklistedServers::AddServersFromFile( const char *pszFilename, bool bRes
|
||||
{
|
||||
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" );
|
||||
|
||||
if ( pszNetAddr && pszNetAddr[0] && pszName && pszName[0] )
|
||||
{
|
||||
blacklisted_server_t *blackServer = m_blackList.AddServer( pszName, pszNetAddr, ulDate );
|
||||
blacklisted_server_t *blackServer = m_blackList.AddServer( pszName, pszNetAddr, ullDate );
|
||||
|
||||
UpdateBlacklistUI( blackServer );
|
||||
}
|
||||
@@ -256,7 +256,7 @@ void CBlacklistedServers::UpdateBlacklistUI( blacklisted_server_t *blackServer )
|
||||
|
||||
// construct a time string for blacklisted time
|
||||
struct tm *now;
|
||||
now = localtime( (time_t*)&blackServer->m_ulTimeBlacklistedAt );
|
||||
now = localtime( (time_t*)&blackServer->m_ullTimeBlacklistedAt );
|
||||
if ( now )
|
||||
{
|
||||
char buf[64];
|
||||
|
||||
@@ -12,6 +12,7 @@
|
||||
#endif
|
||||
|
||||
#include "ServerBrowser/blacklisted_server_manager.h"
|
||||
#include <time.h>
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: Blacklisted servers list
|
||||
@@ -61,7 +62,7 @@ private:
|
||||
vgui::DHANDLE< vgui::FileOpenDialog > m_hImportDialog;
|
||||
|
||||
CBlacklistedServerManager m_blackList;
|
||||
long m_blackListTimestamp;
|
||||
time_t m_blackListTimestamp;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ def configure(conf):
|
||||
conf.define('VERSION_SAFE_STEAM_API_INTERFACES',1)
|
||||
conf.define('SERVERBROWSER_EXPORTS',1)
|
||||
conf.define('GAME_SRC',1)
|
||||
conf.define('_USE_32BIT_TIME_T',1)
|
||||
# conf.define('_USE_32BIT_TIME_T',1)
|
||||
|
||||
def build(bld):
|
||||
source = [
|
||||
@@ -40,14 +40,10 @@ def build(bld):
|
||||
'VACBannedConnRefusedDialog.cpp',
|
||||
'QuickListPanel.cpp',
|
||||
'../public/vgui_controls/vgui_controls.cpp',
|
||||
'../common/ServerBrowser/blacklisted_server_manager.cpp'
|
||||
'../common/ServerBrowser/blacklisted_server_manager.cpp',
|
||||
'../public/tier0/memoverride.cpp'
|
||||
]
|
||||
|
||||
if bld.env.DEST_OS == 'win32':
|
||||
source += [
|
||||
'../public/tier0/memoverride.cpp'
|
||||
]
|
||||
|
||||
includes = [
|
||||
'.',
|
||||
'../public',
|
||||
|
||||
Reference in New Issue
Block a user