h4sard/sm-ext-CSSFixes
1
0
Fork 0
forked from CSSZombieEscape/sm-ext-CSSFixes
Code Issues Pull Requests Releases Wiki Activity

fix build on latest sourcemod

Browse Source
This commit is contained in:
BotoX 2018-02-11 18:50:26 +01:00 committed by BotoX
parent 8d60f6eb64
commit f0981de4ae
2 changed files with 164 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
AMBuildScript
View File

@ -12,7 +12,7 @@ class SDK(object):
self.define = name self.define = name
self.platform = platform self.platform = platform
self.name = dir self.name = dir
self.path = None self.path = None # Actual path
WinOnly = ['windows'] WinOnly = ['windows']
WinLinux = ['windows', 'linux'] WinLinux = ['windows', 'linux']
@ -111,6 +111,32 @@ class ExtensionConfig(object):
cxx = builder.DetectCompilers() cxx = builder.DetectCompilers()
if cxx.like('gcc'): if cxx.like('gcc'):
self.configure_gcc(cxx)
elif cxx.vendor == 'msvc':
self.configure_msvc(cxx)
# Optimizaiton
if builder.options.opt == '1':
cxx.defines += ['NDEBUG']
# Debugging
if builder.options.debug == '1':
cxx.defines += ['DEBUG', '_DEBUG']
# Platform-specifics
if builder.target_platform == 'linux':
self.configure_linux(cxx)
elif builder.target_platform == 'mac':
self.configure_mac(cxx)
elif builder.target_platform == 'windows':
self.configure_windows(cxx)
# Finish up.
cxx.includes += [
os.path.join(self.sm_root, 'public'),
]
def configure_gcc(self, cxx):
cxx.defines += [ cxx.defines += [
'stricmp=strcasecmp', 'stricmp=strcasecmp',
'_stricmp=strcasecmp', '_stricmp=strcasecmp',
@ -129,22 +155,29 @@ class ExtensionConfig(object):
'-Wno-array-bounds', '-Wno-array-bounds',
'-msse', '-msse',
'-m32', '-m32',
'-fvisibility=hidden',
] ]
cxx.cxxflags += [ cxx.cxxflags += [
'-std=c++11', '-std=c++11',
'-fno-exceptions',
'-fno-threadsafe-statics',
'-Wno-non-virtual-dtor',
'-Wno-overloaded-virtual',
'-fvisibility-inlines-hidden',
] ]
cxx.linkflags += ['-m32']
have_gcc = cxx.vendor == 'gcc' have_gcc = cxx.vendor == 'gcc'
have_clang = cxx.vendor == 'clang' have_clang = cxx.vendor == 'clang'
if have_clang or (have_gcc and cxx.version >= '4'): if cxx.version >= 'clang-3.6':
cxx.cflags += ['-fvisibility=hidden'] cxx.cxxflags += ['-Wno-inconsistent-missing-override']
cxx.cxxflags += ['-fvisibility-inlines-hidden'] if have_clang or (cxx.version >= 'gcc-4.6'):
if have_clang or (have_gcc and cxx.version >= '4.6'):
cxx.cflags += ['-Wno-narrowing'] cxx.cflags += ['-Wno-narrowing']
if (have_gcc and cxx.version >= '4.7') or (have_clang and cxx.version >= '3'): if have_clang or (cxx.version >= 'gcc-4.7'):
cxx.cxxflags += ['-Wno-delete-non-virtual-dtor'] cxx.cxxflags += ['-Wno-delete-non-virtual-dtor']
if have_gcc and cxx.version >= '4.8': if cxx.version >= 'gcc-4.8':
cxx.cflags += ['-Wno-unused-result'] cxx.cflags += ['-Wno-unused-result']
if have_clang: if have_clang:
cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch'] cxx.cxxflags += ['-Wno-implicit-exception-spec-mismatch']
if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4': if cxx.version >= 'apple-clang-5.1' or cxx.version >= 'clang-3.4':
@ -153,17 +186,13 @@ class ExtensionConfig(object):
cxx.cxxflags += ['-Wno-deprecated'] cxx.cxxflags += ['-Wno-deprecated']
cxx.cflags += ['-Wno-sometimes-uninitialized'] cxx.cflags += ['-Wno-sometimes-uninitialized']
cxx.linkflags += ['-m32']
cxx.cxxflags += [
'-fno-exceptions',
'-fno-threadsafe-statics',
'-Wno-non-virtual-dtor',
'-Wno-overloaded-virtual',
]
if have_gcc: if have_gcc:
cxx.cflags += ['-mfpmath=sse'] cxx.cflags += ['-mfpmath=sse']
elif cxx.vendor == 'msvc':
if builder.options.opt == '1':
cxx.cflags += ['-O3']
def configure_msvc(self, cxx):
if builder.options.debug == '1': if builder.options.debug == '1':
cxx.cflags += ['/MTd'] cxx.cflags += ['/MTd']
cxx.linkflags += ['/NODEFAULTLIB:libcmt'] cxx.linkflags += ['/NODEFAULTLIB:libcmt']
@ -199,35 +228,26 @@ class ExtensionConfig(object):
'odbccp32.lib', 'odbccp32.lib',
] ]
# Optimization
if builder.options.opt == '1': if builder.options.opt == '1':
cxx.defines += ['NDEBUG']
if cxx.like('gcc'):
cxx.cflags += ['-O3']
elif cxx.like('msvc'):
cxx.cflags += ['/Ox', '/Zo'] cxx.cflags += ['/Ox', '/Zo']
cxx.linkflags += ['/OPT:ICF', '/OPT:REF'] cxx.linkflags += ['/OPT:ICF', '/OPT:REF']
# Debugging
if builder.options.debug == '1': if builder.options.debug == '1':
cxx.defines += ['DEBUG', '_DEBUG']
if cxx.like('msvc'):
cxx.cflags += ['/Od', '/RTC1'] cxx.cflags += ['/Od', '/RTC1']
# This needs to be after our optimization flags which could otherwise disable it. # This needs to be after our optimization flags which could otherwise disable it.
if cxx.vendor == 'msvc':
# Don't omit the frame pointer. # Don't omit the frame pointer.
cxx.cflags += ['/Oy-'] cxx.cflags += ['/Oy-']
# Platform-specifics def configure_linux(self, cxx):
if builder.target_platform == 'linux':
cxx.defines += ['_LINUX', 'POSIX'] cxx.defines += ['_LINUX', 'POSIX']
cxx.linkflags += ['-lm'] cxx.linkflags += ['-Wl,--exclude-libs,ALL', '-lm']
if cxx.vendor == 'gcc': if cxx.vendor == 'gcc':
cxx.linkflags += ['-static-libgcc'] cxx.linkflags += ['-static-libgcc']
elif cxx.vendor == 'clang': elif cxx.vendor == 'clang':
cxx.linkflags += ['-lgcc_eh'] cxx.linkflags += ['-lgcc_eh']
elif builder.target_platform == 'mac':
def configure_mac(self, cxx):
cxx.defines += ['OSX', '_OSX', 'POSIX'] cxx.defines += ['OSX', '_OSX', 'POSIX']
cxx.cflags += ['-mmacosx-version-min=10.5'] cxx.cflags += ['-mmacosx-version-min=10.5']
cxx.linkflags += [ cxx.linkflags += [
@ -237,13 +257,21 @@ class ExtensionConfig(object):
'-stdlib=libstdc++', '-stdlib=libstdc++',
] ]
cxx.cxxflags += ['-stdlib=libstdc++'] cxx.cxxflags += ['-stdlib=libstdc++']
elif builder.target_platform == 'windows':
def configure_windows(self, cxx):
cxx.defines += ['WIN32', '_WINDOWS'] cxx.defines += ['WIN32', '_WINDOWS']
# Finish up. def ConfigureForExtension(self, context, compiler):
cxx.includes += [ compiler.cxxincludes += [
os.path.join(context.currentSourcePath),
os.path.join(context.currentSourcePath, 'sdk'),
os.path.join(self.sm_root, 'public'), os.path.join(self.sm_root, 'public'),
os.path.join(self.sm_root, 'public', 'extensions'),
os.path.join(self.sm_root, 'sourcepawn', 'include'),
os.path.join(self.sm_root, 'public', 'amtl', 'amtl'),
os.path.join(self.sm_root, 'public', 'amtl'),
] ]
return compiler
def ConfigureForHL2(self, binary, sdk): def ConfigureForHL2(self, binary, sdk):
compiler = binary.compiler compiler = binary.compiler
@ -294,10 +322,10 @@ class ExtensionConfig(object):
# For everything after Swarm, this needs to be defined for entity networking # For everything after Swarm, this needs to be defined for entity networking
# to work properly with sendprop value changes. # to work properly with sendprop value changes.
if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']: if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
compiler.defines += ['NETWORK_VARS_ENABLED'] compiler.defines += ['NETWORK_VARS_ENABLED']
if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2', 'dota']: if sdk.name in ['css', 'hl2dm', 'dods', 'sdk2013', 'bms', 'tf2', 'l4d', 'nucleardawn', 'l4d2']:
if builder.target_platform in ['linux', 'mac']: if builder.target_platform in ['linux', 'mac']:
compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE'] compiler.defines += ['NO_HOOK_MALLOC', 'NO_MALLOC_OVERRIDE']
@ -332,14 +360,14 @@ class ExtensionConfig(object):
compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a')) compiler.Dep(os.path.join(lib_folder, 'mathlib_i486.a'))
] ]
if sdk.name in ['blade', 'insurgency', 'csgo', 'dota']: if sdk.name in ['blade', 'insurgency', 'doi', 'csgo']:
compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))] compiler.postlink += [compiler.Dep(os.path.join(lib_folder, 'interfaces_i486.a'))]
dynamic_libs = [] dynamic_libs = []
if builder.target_platform == 'linux': if builder.target_platform == 'linux':
if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2']: if sdk.name in ['css', 'hl2dm', 'dods', 'tf2', 'sdk2013', 'bms', 'nucleardawn', 'l4d2', 'insurgency', 'doi']:
dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so'] dynamic_libs = ['libtier0_srv.so', 'libvstdlib_srv.so']
elif sdk.name in ['l4d', 'blade', 'insurgency', 'csgo', 'dota']: elif sdk.name in ['l4d', 'blade', 'insurgency', 'doi', 'csgo']:
dynamic_libs = ['libtier0.so', 'libvstdlib.so'] dynamic_libs = ['libtier0.so', 'libvstdlib.so']
else: else:
dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so'] dynamic_libs = ['tier0_i486.so', 'vstdlib_i486.so']
@ -348,7 +376,7 @@ class ExtensionConfig(object):
dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib'] dynamic_libs = ['libtier0.dylib', 'libvstdlib.dylib']
elif builder.target_platform == 'windows': elif builder.target_platform == 'windows':
libs = ['tier0', 'tier1', 'vstdlib', 'mathlib'] libs = ['tier0', 'tier1', 'vstdlib', 'mathlib']
if sdk.name in ['swarm', 'blade', 'insurgency', 'csgo', 'dota']: if sdk.name in ['swarm', 'blade', 'insurgency', 'doi', 'csgo']:
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' lib_path = os.path.join(sdk.path, 'lib', 'public', lib) + '.lib'
@ -369,16 +397,10 @@ class ExtensionConfig(object):
return binary return binary
def ConfigureForExtension(self, context, compiler): def HL2Library(self, context, name, sdk):
compiler.cxxincludes += [ binary = context.compiler.Library(name)
os.path.join(context.currentSourcePath), self.ConfigureForExtension(context, binary.compiler)
os.path.join(context.currentSourcePath, 'sdk'), return self.ConfigureForHL2(binary, sdk)
os.path.join(self.sm_root, 'public'),
os.path.join(self.sm_root, 'public', 'extensions'),
os.path.join(self.sm_root, 'sourcepawn', 'include'),
os.path.join(self.sm_root, 'public', 'amtl', 'include'),
]
return compiler
def HL2Project(self, context, name): def HL2Project(self, context, name):
project = context.compiler.LibraryProject(name) project = context.compiler.LibraryProject(name)

14
AMBuilder
View File

@ -11,16 +11,18 @@ project.sources += [
'extension.cpp', 'extension.cpp',
'../../public/smsdk_ext.cpp', '../../public/smsdk_ext.cpp',
'../../public/CDetour/detours.cpp', '../../public/CDetour/detours.cpp',
'../../public/asm/asm.c' '../../public/asm/asm.c',
'../../public/libudis86/decode.c',
'../../public/libudis86/itab.c',
'../../public/libudis86/syn-att.c',
'../../public/libudis86/syn-intel.c',
'../../public/libudis86/syn.c',
'../../public/libudis86/udis86.c',
] ]
project.compiler.defines += ['HAVE_STRING_H'];
for sdk_name in SM.sdks: for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name] sdk = SM.sdks[sdk_name]
binary = SM.HL2Config(project, projectName + '.ext', sdk) binary = SM.HL2Config(project, projectName + '.ext', sdk)
binary.compiler.cxxincludes += [
os.path.join(SM.sm_root, 'public', 'extensions'),
os.path.join(SM.sm_root, 'public', 'sourcepawn'),
os.path.join(SM.sm_root, 'public', 'amtl')
]
SM.extensions += builder.Add(project) SM.extensions += builder.Add(project)