From 1a938f87116c085fe2697b0a5d2624bc0443300c Mon Sep 17 00:00:00 2001 From: Fyren Date: Thu, 29 Apr 2010 00:08:08 -0700 Subject: [PATCH] ep2v build changes (bug 4371, r=dvander) --- AMBuildScript | 4 ++-- core/GameConfigs.cpp | 2 +- extensions/sdktools/vcaller.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index 8f307627..eb3e5544 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -200,7 +200,7 @@ class SM: else: staticLibs = os.path.join(sdkPath, 'lib', 'linux') workFolder = os.path.join(AMBuild.outputFolder, job.workFolder) - if sdk == 'l4d2': + if sdk == 'ep2v' or sdk == 'l4d2': for i in ['tier1_i486.a', 'mathlib_i486.a', 'libvstdlib.so', 'libtier0.so']: link = os.path.join(workFolder, i) target = os.path.join(staticLibs, i) @@ -268,7 +268,7 @@ class SM: if not noLink: if AMBuild.target['platform'] == 'linux': compiler['POSTLINKFLAGS'][0:0] = ['-lm'] - if sdk == 'l4d2': + if sdk == 'ep2v' or sdk == 'l4d2': compiler['POSTLINKFLAGS'][0:0] = ['libtier0.so'] compiler['POSTLINKFLAGS'][0:0] = ['libvstdlib.so'] else: diff --git a/core/GameConfigs.cpp b/core/GameConfigs.cpp index 1b994ff4..56920b22 100644 --- a/core/GameConfigs.cpp +++ b/core/GameConfigs.cpp @@ -557,7 +557,7 @@ SMCResult CGameConfig::ReadSMC_LeavingSection(const SMCStates *states) void *handle = dlopen(info.dli_fname, RTLD_NOW); if (handle) { -#if SOURCE_ENGINE == SE_LEFT4DEAD2 +#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2) final_addr = g_MemUtils.ResolveSymbol(handle, &s_TempSig.sig[1]); #else final_addr = dlsym(handle, &s_TempSig.sig[1]); diff --git a/extensions/sdktools/vcaller.cpp b/extensions/sdktools/vcaller.cpp index 73480d27..f525f30a 100644 --- a/extensions/sdktools/vcaller.cpp +++ b/extensions/sdktools/vcaller.cpp @@ -129,7 +129,7 @@ static cell_t PrepSDKCall_SetSignature(IPluginContext *pContext, const cell_t *p { return 0; } -#if SOURCE_ENGINE == SE_LEFT4DEAD2 +#if (SOURCE_ENGINE == SE_ORANGEBOXVALVE) || (SOURCE_ENGINE == SE_LEFT4DEAD2) s_call_addr = memutils->ResolveSymbol(handle, &sig[1]); #else s_call_addr = dlsym(handle, &sig[1]);