UNLOZE/sm-ext-connect
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix linux compile with latest SDK

Browse Source 
This needs some cleanup still for non-TF2
This commit is contained in:
Asher Baker 2017-10-26 13:53:57 +01:00
parent f557476d6b
commit 3b9e6208ea
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AMBuildScript
View File

@ -34,7 +34,7 @@ class SM:
self.possibleSdks['ep2'] = {'sdk': 'HL2SDKOB', 'ext': '2.ep2', 'def': '3', self.possibleSdks['ep2'] = {'sdk': 'HL2SDKOB', 'ext': '2.ep2', 'def': '3',
'name': 'ORANGEBOX', 'platform': []} 'name': 'ORANGEBOX', 'platform': []}
self.possibleSdks['css'] = {'sdk': 'HL2SDKCSS', 'ext': '2.css', 'def': '6', self.possibleSdks['css'] = {'sdk': 'HL2SDKCSS', 'ext': '2.css', 'def': '6',
'name': 'CSS', 'platform': ['windows', 'linux', 'darwin']} 'name': 'CSS', 'platform': []}
self.possibleSdks['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '7', self.possibleSdks['ep2v'] = {'sdk': 'HL2SDKOBVALVE', 'ext': '2.ep2v', 'def': '7',
'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']} 'name': 'ORANGEBOXVALVE', 'platform': ['windows', 'linux', 'darwin']}
self.possibleSdks['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '8', self.possibleSdks['l4d'] = {'sdk': 'HL2SDKL4D', 'ext': '2.l4d', 'def': '8',
@ -60,7 +60,7 @@ class SM:
#Detect variables #Detect variables
envvars = { 'MMSOURCE19': 'mmsource-1.9', envvars = { 'MMSOURCE19': 'mmsource-1.9',
'SOURCEMOD14': 'sourcemod-1.4', 'SOURCEMOD14': 'sourcemod-1.7',
'HL2SDKCSS': 'hl2sdk-css', 'HL2SDKCSS': 'hl2sdk-css',
'HL2SDKOBVALVE': 'hl2sdk-ob-valve', 'HL2SDKOBVALVE': 'hl2sdk-ob-valve',
'HL2SDKL4D': 'hl2sdk-l4d', 'HL2SDKL4D': 'hl2sdk-l4d',
@ -203,6 +203,7 @@ class SM:
#Platform-specifics #Platform-specifics
if AMBuild.target['platform'] == 'linux': if AMBuild.target['platform'] == 'linux':
self.compiler.AddToListVar('CDEFINES', 'POSIX')
self.compiler.AddToListVar('CDEFINES', '_LINUX') self.compiler.AddToListVar('CDEFINES', '_LINUX')
if self.vendor == 'gcc': if self.vendor == 'gcc':
self.compiler.AddToListVar('POSTLINKFLAGS', '-static-libgcc') self.compiler.AddToListVar('POSTLINKFLAGS', '-static-libgcc')

2
extension/extension.cpp
View File

@ -71,7 +71,7 @@ public:
unsigned short port; unsigned short port;
} netadr_t; } netadr_t;
char *CSteamID::Render() const const char *CSteamID::Render() const
{ {
static char szSteamID[64]; static char szSteamID[64];
V_snprintf(szSteamID, sizeof(szSteamID), "STEAM_0:%u:%u", (m_unAccountID % 2) ? 1 : 0, (int32)m_unAccountID/2); V_snprintf(szSteamID, sizeof(szSteamID), "STEAM_0:%u:%u", (m_unAccountID % 2) ? 1 : 0, (int32)m_unAccountID/2);

10
extension/sdk/smsdk_ext.cpp
View File

@ -461,5 +461,15 @@ void operator delete[](void * ptr)
{ {
free(ptr); free(ptr);
} }
void operator delete(void *ptr, size_t size)
{
free(ptr);
}
void operator delete[](void * ptr, size_t size)
{
free(ptr);
}
#endif #endif