source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-06 18:08:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix for latest AMBuild API.

Browse Source
This commit is contained in:
David Anderson 2020-08-24 21:41:35 -07:00
parent 26aa51c395
commit a4aafd7625
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AMBuildScript
View File

@ -433,18 +433,18 @@ class MMSConfig(object):
if compiler.target.platform in ['linux', 'mac']: if compiler.target.platform in ['linux', 'mac']:
if sdk.name in ['sdk2013', 'bms'] or compiler.target.arch == 'x86_64': if sdk.name in ['sdk2013', 'bms'] or compiler.target.arch == 'x86_64':
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1.a'))] compiler.postlink += [os.path.join(lib_folder, 'tier1.a')]
else: else:
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'tier1_i486.a'))] compiler.postlink += [os.path.join(lib_folder, 'tier1_i486.a')]
if sdk.name in ['blade', 'insurgency', 'doi', 'csgo', 'dota']: if sdk.name in ['blade', 'insurgency', 'doi', 'csgo', 'dota']:
if compiler.target.arch == 'x86_64': if compiler.target.arch == 'x86_64':
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces.a'))] compiler.postlink += [os.path.join(lib_folder, 'interfaces.a')]
else: else:
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))] compiler.postlink += [os.path.join(lib_folder, 'interfaces_i486.a')]
if sdk.name == 'bms': if sdk.name == 'bms':
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'mathlib.a'))] compiler.postlink += [os.path.join(lib_folder, 'mathlib.a')]
binary = self.Library(compiler, name) binary = self.Library(compiler, name)
compiler = binary.compiler compiler = binary.compiler
@ -474,20 +474,17 @@ class MMSConfig(object):
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib' lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
elif compiler.target.arch == 'x86_64': elif compiler.target.arch == 'x86_64':
lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib' lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
binary.compiler.linkflags.append(binary.Dep(lib_path)) binary.compiler.linkflags.append(lib_path)
for library in dynamic_libs: for library in dynamic_libs:
source_path = os.path.join(lib_folder, library) source_path = os.path.join(lib_folder, library)
output_path = os.path.join(binary.localFolder, library) output_path = os.path.join(binary.localFolder, library)
def make_linker(source_path, output_path): context.AddFolder(binary.localFolder)
def link(context, binary): output = context.AddSymlink(source_path, output_path)
cmd_node, (output,) = context.AddSymlink(source_path, output_path)
return output
return link
linker = make_linker(source_path, output_path) binary.compiler.weaklinkdeps += [output]
binary.compiler.linkflags[0:0] = [binary.Dep(library, linker)] binary.compiler.linkflags[0:0] = [library]
return binary return binary

2
support/buildbot/Versioning
View File

@ -35,7 +35,7 @@ sources = [
# The script source is a dependency, of course... # The script source is a dependency, of course...
argv[1] argv[1]
] ]
cmd_node, output_nodes = builder.AddCommand( output_nodes = builder.AddCommand(
inputs=sources, inputs=sources,
argv=argv, argv=argv,
outputs=outputs outputs=outputs