UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Updated for CS:S sync (r=asherkin).

Browse Source
This commit is contained in:
Peace-Maker 2013-02-05 21:45:11 +00:00
parent c2ecb7363c
commit cd9a28864a
4 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AMBuildScript
View File

@ -277,7 +277,7 @@ class SM:
else: else:
staticLibs = os.path.join(sdkPath, 'lib', 'linux') staticLibs = os.path.join(sdkPath, 'lib', 'linux')
workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) workFolder = os.path.join(AMBuild.outputFolder, job.workFolder)
if sdk == 'ep2v': if sdk in ['ep2v', 'css']:
libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so'] libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib_srv.so', 'libtier0_srv.so']
for lib in libs: for lib in libs:
link = os.path.join(workFolder, lib) link = os.path.join(workFolder, lib)
@ -286,7 +286,7 @@ class SM:
os.lstat(link) os.lstat(link)
except: except:
job.AddCommand(SymlinkCommand(link, target)) job.AddCommand(SymlinkCommand(link, target))
elif sdk in ['css', 'l4d', 'l4d2', 'csgo']: elif sdk in ['l4d', 'l4d2', 'csgo']:
libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so'] libs = ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']
if sdk == 'csgo': if sdk == 'csgo':
libs.append('interfaces_i486.a') libs.append('interfaces_i486.a')
@ -388,10 +388,10 @@ class SM:
if not noLink: if not noLink:
if AMBuild.target['platform'] == 'linux': if AMBuild.target['platform'] == 'linux':
compiler['POSTLINKFLAGS'][0:0] = ['-lm'] compiler['POSTLINKFLAGS'][0:0] = ['-lm']
if sdk == 'ep2v': if sdk in ['ep2v', 'css']:
compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so'] compiler['POSTLINKFLAGS'][0:0] = ['libtier0_srv.so']
compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib_srv.so']
elif sdk in ['css', 'l4d', 'l4d2', 'csgo']: elif sdk in ['l4d', 'l4d2', 'csgo']:
compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so'] compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so']
compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so']
else: else:

4
core/HalfLife2.cpp
View File

@ -56,10 +56,10 @@ typedef ICommandLine *(*FakeGetCommandLine)();
#define TIER0_NAME "libtier0.dylib" #define TIER0_NAME "libtier0.dylib"
#define VSTDLIB_NAME "libvstdlib.dylib" #define VSTDLIB_NAME "libvstdlib.dylib"
#elif defined __linux__ #elif defined __linux__
#if SOURCE_ENGINE == SE_ORANGEBOXVALVE #if SOURCE_ENGINE == SE_ORANGEBOXVALVE || SOURCE_ENGINE == SE_CSS
#define TIER0_NAME "libtier0_srv.so" #define TIER0_NAME "libtier0_srv.so"
#define VSTDLIB_NAME "libvstdlib_srv.so" #define VSTDLIB_NAME "libvstdlib_srv.so"
#elif SOURCE_ENGINE >= SE_CSS #elif SOURCE_ENGINE >= SE_LEFT4DEAD
#define TIER0_NAME "libtier0.so" #define TIER0_NAME "libtier0.so"
#define VSTDLIB_NAME "libvstdlib.so" #define VSTDLIB_NAME "libvstdlib.so"
#else #else

2
core/Makefile
View File

@ -131,7 +131,7 @@ ifneq (,$(filter original orangebox left4dead,$(ENGINE)))
LIB_SUFFIX = _i486.$(LIB_EXT) LIB_SUFFIX = _i486.$(LIB_EXT)
else else
LIB_PREFIX = lib LIB_PREFIX = lib
ifeq "$(ENGINE)" "orangeboxvalve" ifneq (,$(filter orangeboxvalve css,$(ENGINE)))
ifneq "$(OS)" "Darwin" ifneq "$(OS)" "Darwin"
LIB_SUFFIX = _srv.$(LIB_EXT) LIB_SUFFIX = _srv.$(LIB_EXT)
else else

8
extensions/sdktools/vglobals.cpp
View File

@ -127,22 +127,14 @@ void GetIServer()
#if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11 #if defined METAMOD_PLAPI_VERSION || PLAPI_VERSION >= 11
/* Get the CreateFakeClient function pointer */ /* Get the CreateFakeClient function pointer */
#if SOURCE_ENGINE == SE_CSS
if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClientEx)))
#else
if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClient))) if (!(vfunc=SH_GET_ORIG_VFNPTR_ENTRY(engine, &IVEngineServer::CreateFakeClient)))
#endif
{ {
return; return;
} }
#else #else
/* Get the interface manually */ /* Get the interface manually */
SourceHook::MemFuncInfo info = {true, -1, 0, 0}; SourceHook::MemFuncInfo info = {true, -1, 0, 0};
#if SOURCE_ENGINE == SE_CSS
SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClientEx, info);
#else
SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClient, info); SourceHook::GetFuncInfo(&IVEngineServer::CreateFakeClient, info);
#endif
vfunc = enginePatch->GetOrigFunc(info.vtbloffs, info.vtblindex); vfunc = enginePatch->GetOrigFunc(info.vtbloffs, info.vtblindex);
if (!vfunc) if (!vfunc)