Skip to content

Commit ddc5628

Browse files
committed
Fix up lib paths since we don't have them from manifests
1 parent f5027c9 commit ddc5628

1 file changed

Lines changed: 13 additions & 2 deletions

File tree

AMBuildScript

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -431,6 +431,11 @@ class MMSConfig(object):
431431
lib_folder = os.path.join(sdk.path, 'linux_sdk')
432432
elif sdk.name in ['sdk2013', 'bms']:
433433
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux32')
434+
elif sdk.name in ['css', 'hl2dm', 'dods', 'tf2']:
435+
if compiler.target.arch == 'x86_64':
436+
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux64')
437+
else:
438+
lib_folder = os.path.join(sdk.path, 'lib', 'public', 'linux')
434439
elif compiler.target.arch == 'x86_64':
435440
lib_folder = os.path.join(sdk.path, 'lib', 'linux64')
436441
else:
@@ -486,9 +491,15 @@ class MMSConfig(object):
486491
libs.append('mathlib')
487492
for lib in libs:
488493
if compiler.target.arch == 'x86':
489-
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
494+
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2']:
495+
lib_path = os.path.join(sdk.path, 'lib', 'public', 'x86', lib) + '.lib'
496+
else:
497+
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
490498
elif compiler.target.arch == 'x86_64':
491-
lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
499+
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2']:
500+
lib_path = os.path.join(sdk.path, 'lib', 'public', 'x64', lib) + '.lib'
501+
else:
502+
lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
492503
binary.compiler.linkflags.append(lib_path)
493504

494505
for library in dynamic_libs:

0 commit comments

Comments
 (0)