Skip to content

Commit 3faf6a6

Browse files
committed
fix windows build scripts, add windows opus support
1 parent 90cd6e0 commit 3faf6a6

File tree

149 files changed

+396
-170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+396
-170
lines changed

.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,6 @@ android/
3535
.cache/
3636
.ccache/
3737
waf3*/
38-
.vscode/
38+
.vscode/
39+
.depproj/
40+
source-engine.sln

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@
66
url = https://github.com/nillerusr/source-physics
77
[submodule "lib"]
88
path = lib
9-
url = https://github.com/nillerusr/source-engine-libs
9+
url = https://github.com/nillerusr/source-engine-libs.git

bitmap/colorconversion.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -828,7 +828,7 @@ bool ConvertToATIxN( const uint8 *src, ImageFormat srcImageFormat,
828828
uint8 *dst, ImageFormat dstImageFormat,
829829
int width, int height, int srcStride, int dstStride )
830830
{
831-
#if !defined( _X360 ) && !defined( POSIX )
831+
#if 0
832832

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

bitmap/wscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def build(bld):
4848

4949
libs = []
5050

51-
if bld.env.DEST_OS == 'win32':
52-
libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
51+
#if bld.env.DEST_OS == 'win32':
52+
# libs += ['NVTC', 'ATI_COMPRESS_MT_VC10']
5353

5454
bld.stlib(
5555
source = source,

common/ServerBrowser/blacklisted_server_manager.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
5353
{
5454
const char *pszName = pData->GetString( "name" );
5555

56-
uint32 ulDate = pData->GetInt( "date" );
56+
uint64 ullDate = pData->GetUint64( "date" );
5757
if ( bResetTimes )
5858
{
5959
time_t today;
6060
time( &today );
61-
ulDate = today;
61+
ullDate = (uint64)today;
6262
}
6363

6464
const char *pszNetAddr = pData->GetString( "addr" );
@@ -68,7 +68,7 @@ int CBlacklistedServerManager::LoadServersFromFile( const char *pszFilename, boo
6868

6969
m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
7070
V_strncpy( m_Blacklist[iIdx].m_szServerName, pszName, sizeof( m_Blacklist[iIdx].m_szServerName ) );
71-
m_Blacklist[iIdx].m_ulTimeBlacklistedAt = ulDate;
71+
m_Blacklist[iIdx].m_ullTimeBlacklistedAt = ullDate;
7272
m_Blacklist[iIdx].m_NetAdr.SetFromString( pszNetAddr );
7373

7474
++count;
@@ -92,7 +92,7 @@ void CBlacklistedServerManager::SaveToFile( const char *pszFilename )
9292
{
9393
KeyValues *pSubKey = new KeyValues( "server" );
9494
pSubKey->SetString( "name", m_Blacklist[i].m_szServerName );
95-
pSubKey->SetInt( "date", m_Blacklist[i].m_ulTimeBlacklistedAt );
95+
pSubKey->SetUint64( "date", m_Blacklist[i].m_ullTimeBlacklistedAt );
9696
pSubKey->SetString( "addr", m_Blacklist[i].m_NetAdr.ToString() );
9797
pKV->AddSubKey( pSubKey );
9898
}
@@ -120,7 +120,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( gameserveritem_t &se
120120

121121
time_t today;
122122
time( &today );
123-
m_Blacklist[iIdx].m_ulTimeBlacklistedAt = today;
123+
m_Blacklist[iIdx].m_ullTimeBlacklistedAt = (uint64)today;
124124
m_Blacklist[iIdx].m_NetAdr = netAdr;
125125
m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
126126

@@ -145,7 +145,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
145145

146146
time_t today;
147147
time( &today );
148-
m_Blacklist[iIdx].m_ulTimeBlacklistedAt = today;
148+
m_Blacklist[iIdx].m_ullTimeBlacklistedAt = (uint64)today;
149149

150150
m_Blacklist[iIdx].m_NetAdr = netAdr;
151151
m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
@@ -157,7 +157,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
157157
//-----------------------------------------------------------------------------
158158
// Purpose: Add the given server to the blacklist. Return added server.
159159
//-----------------------------------------------------------------------------
160-
blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, uint32 timestamp )
160+
blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverName, const char *netAddressString, uint64 timestamp )
161161
{
162162
netadr_t netAdr( netAddressString );
163163

@@ -168,7 +168,7 @@ blacklisted_server_t *CBlacklistedServerManager::AddServer( const char *serverNa
168168
int iIdx = m_Blacklist.AddToTail();
169169

170170
V_strncpy( m_Blacklist[iIdx].m_szServerName, serverName, sizeof( m_Blacklist[iIdx].m_szServerName ) );
171-
m_Blacklist[iIdx].m_ulTimeBlacklistedAt = timestamp;
171+
m_Blacklist[iIdx].m_ullTimeBlacklistedAt = timestamp;
172172
m_Blacklist[iIdx].m_NetAdr = netAdr;
173173
m_Blacklist[iIdx].m_nServerID = m_iNextServerID++;
174174

common/ServerBrowser/blacklisted_server_manager.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ struct blacklisted_server_t
2323
{
2424
int m_nServerID;
2525
char m_szServerName[64];
26-
uint32 m_ulTimeBlacklistedAt;
26+
uint64 m_ullTimeBlacklistedAt;
2727
netadr_t m_NetAdr;
2828
};
2929

@@ -40,7 +40,7 @@ class CBlacklistedServerManager
4040

4141
blacklisted_server_t *AddServer( gameserveritem_t &server );
4242
blacklisted_server_t *AddServer( const char *serverName, uint32 serverIP, int serverPort );
43-
blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, uint32 timestamp );
43+
blacklisted_server_t *AddServer( const char *serverName, const char *netAddressString, uint64 timestamp );
4444

4545
void RemoveServer( int iServerID ); // remove server with matching 'server id' from list
4646

datacache/wscript

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ def build(bld):
2020
'mdlcache.cpp',
2121
'../public/studio.cpp',
2222
'../public/studio_virtualmodel.cpp',
23-
'../common/studiobyteswap.cpp'
23+
'../common/studiobyteswap.cpp',
24+
'../public/tier0/memoverride.cpp'
2425
]
2526

2627
includes = [

dedicated/wscript

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ def build(bld):
3333
'../filesystem/filesystem_stdio.cpp',
3434
'../filesystem/QueuedLoader.cpp',
3535
'../public/zip_utils.cpp',
36+
'../public/tier0/memoverride.cpp'
3637
]
3738

38-
if bld.env.DEST_OS == 'win32'
39+
if bld.env.DEST_OS == 'win32':
3940
source += [
4041
'sys_windows.cpp'
4142
]

dx9sdk/lib/amd64/D3DCSX.lib

3.57 KB
Binary file not shown.

dx9sdk/lib/amd64/D3DCSXd.lib

3.6 KB
Binary file not shown.

0 commit comments

Comments
 (0)