rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2024-12-01 13:24:25 +01:00
Code Issues Releases Activity

Fix linker flags and lib paths on Win64.

Browse Source
This commit is contained in:
Nicholas Hastings 2016-07-26 10:51:13 -04:00
parent a779cb9b76
commit eeef0b5c0c
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
AMBuildScript
View File

@ -202,8 +202,13 @@ class MMSConfig(object):
'/Zi', '/Zi',
] ]
cxx.cxxflags += ['/TP'] cxx.cxxflags += ['/TP']
if builder.target.arch == 'x86':
cxx.linkflags += ['/MACHINE:X86']
elif builder.target.arch == 'x86_64':
cxx.linkflags += ['/MACHINE:X64']
cxx.linkflags += [ cxx.linkflags += [
'/MACHINE:X86',
'/SUBSYSTEM:WINDOWS', '/SUBSYSTEM:WINDOWS',
'kernel32.lib', 'kernel32.lib',
'user32.lib', 'user32.lib',
@ -217,7 +222,7 @@ class MMSConfig(object):
'uuid.lib', 'uuid.lib',
'odbc32.lib', 'odbc32.lib',
'odbccp32.lib', 'odbccp32.lib',
] ]
# Optimization # Optimization
if builder.options.opt == '1': if builder.options.opt == '1':
@ -413,7 +418,10 @@ class MMSConfig(object):
if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']:
libs.append('interfaces') libs.append('interfaces')
for lib in libs: for lib in libs:
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib' if builder.target.arch == 'x86':
lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
elif builder.target.arch == 'x86_64':
lib_path = os.path.join(sdk.path, 'lib', 'public', 'win64', lib) + '.lib'
binary.compiler.linkflags.append(binary.Dep(lib_path)) binary.compiler.linkflags.append(binary.Dep(lib_path))
for library in dynamic_libs: for library in dynamic_libs: