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

Fix linker issues on Linux.

Browse Source
This commit is contained in:
David Anderson 2023-10-13 15:26:05 -07:00
parent fac3138ff5
commit f01ad5317a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AMBuildScript
View File

@ -509,6 +509,7 @@ class SMConfig(object):
self.AddVersioning(binary) self.AddVersioning(binary)
if binary.compiler.like('msvc'): if binary.compiler.like('msvc'):
binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS'] binary.compiler.linkflags += ['/SUBSYSTEM:WINDOWS']
self.AddCxxCompat(binary)
# Dumb clang behavior means we have to manually find libclang_rt. # Dumb clang behavior means we have to manually find libclang_rt.
if self.enable_asan: if self.enable_asan:
@ -568,9 +569,16 @@ class SMConfig(object):
self.ConfigureForExtension(context, binary.compiler) self.ConfigureForExtension(context, binary.compiler)
return binary return binary
def AddCxxCompat(self, binary):
if binary.compiler.target.platform == 'linux':
binary.sources += [
os.path.join(builder.sourcePath, 'public', 'amtl', 'compat', 'stdcxx.cpp'),
]
def ConfigureForHL2(self, context, binary, sdk): def ConfigureForHL2(self, context, binary, sdk):
compiler = binary.compiler compiler = binary.compiler
SetArchFlags(compiler) SetArchFlags(compiler)
self.AddCxxCompat(binary)
compiler.cxxincludes += [ compiler.cxxincludes += [
os.path.join(self.mms_root, 'core'), os.path.join(self.mms_root, 'core'),

2
public/amtl

@ -1 +1 @@
Subproject commit fb8a4edaeaeea97b1c07f42b8a8ba97ce2c614cd Subproject commit 285b4f853c0003023838140113e3ec066bd800c6