From 40aa98fe648ef656af05f31300454097b2bb5ffc Mon Sep 17 00:00:00 2001 From: Nicholas Hastings Date: Sun, 10 May 2015 18:05:26 -0400 Subject: [PATCH] AMBuildScript fixes for Black Mesa that didn't get committed when making PR. --- AMBuildScript | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/AMBuildScript b/AMBuildScript index d3d72ea..9a5bf77 100644 --- a/AMBuildScript +++ b/AMBuildScript @@ -266,7 +266,7 @@ class MMSConfig(object): compiler.defines += ['SOURCE_ENGINE=' + sdk.code] - if sdk.name == 'sdk2013' and compiler.cxx.behavior == 'gcc': + if sdk.name in ['sdk2013', 'bms'] and compiler.cxx.behavior == 'gcc': # The 2013 SDK already has these in public/tier0/basetypes.h compiler.defines.remove('stricmp=strcasecmp') compiler.defines.remove('_stricmp=strcasecmp') @@ -278,7 +278,7 @@ class MMSConfig(object): else: compiler.defines += ['COMPILER_GCC'] - if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']: + if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']: if builder.target_platform in ['linux', 'mac']: compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE'] @@ -319,18 +319,18 @@ class MMSConfig(object): if builder.target_platform == 'linux': if sdk.name == 'episode1': lib_folder = os.path.join(sdk.path, 'linux_sdk') - elif sdk.name == 'sdk2013': + elif sdk.name in ['sdk2013', 'bms']: lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32') else: lib_folder = os.path.join(sdk.path, 'lib', 'linux') elif builder.target_platform == 'mac': - if sdk.name == 'sdk2013': + if sdk.name in ['sdk2013', 'bms']: lib_folder = os.path.join(sdk.path, 'lib', 'public', 'osx32') else: lib_folder = os.path.join(sdk.path, 'lib', 'mac') if builder.target_platform in ['linux', 'mac']: - if sdk.name == 'sdk2013': + if sdk.name in ['sdk2013', 'bms']: compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1.a'))] else: compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a'))]