UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix attempting to link win32 libprotobuf on win64.

Browse Source
This commit is contained in:
Nick Hastings 2021-10-13 12:05:51 -04:00 committed by Your Name
parent 656a9fa94f
commit 633298b6a9
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/AMBuilder
View File

@ -94,15 +94,21 @@ for sdk_name in SM.sdks:
elif compiler.target.platform == 'windows': elif compiler.target.platform == 'windows':
msvc_ver = compiler.version msvc_ver = compiler.version
vs_year = '' vs_year = ''
platform = ''
if compiler.target.arch == 'x86':
platform = 'win32'
elif compiler.target.arch == 'x86_64':
platform = 'win64'
if 1900 <= msvc_ver < 2000: if 1900 <= msvc_ver < 2000:
vs_year = '2015' vs_year = '2015'
else: else:
raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"') raise Exception('Cannot find libprotobuf for MSVC version "' + str(compiler.version) + '"')
if 'DEBUG' in compiler.defines: if 'DEBUG' in compiler.defines:
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'debug', 'vs' + vs_year, 'libprotobuf.lib') lib_path = os.path.join(sdk.path, 'lib', platform, 'debug', 'vs' + vs_year, 'libprotobuf.lib')
else: else:
lib_path = os.path.join(sdk.path, 'lib', 'win32', 'release', 'vs' + vs_year, 'libprotobuf.lib') lib_path = os.path.join(sdk.path, 'lib', platform, 'release', 'vs' + vs_year, 'libprotobuf.lib')
compiler.linkflags.insert(0, lib_path) compiler.linkflags.insert(0, lib_path)
if sdk.name in ['csgo', 'blade']: if sdk.name in ['csgo', 'blade']: