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

Enable C++17.

Browse Source
This commit is contained in:
David Anderson 2023-10-13 15:21:54 -07:00 committed by Nick Hastings
parent 1ba7024a3a
commit ae4e043c3e
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
AMBuildScript
View File

@ -251,14 +251,14 @@ class SMConfig(object):
def configure_cxx(self, cxx):
if cxx.family == 'msvc':
if cxx.version < 1900:
raise Exception('Only MSVC 2015 and later are supported, c++14 support is required.')
if cxx.family == 'gcc':
if cxx.version < 'gcc-4.9':
raise Exception('Only GCC versions 4.9 or greater are supported, c++14 support is required.')
if cxx.family == 'clang':
if cxx.version < 'clang-3.4':
raise Exception('Only clang versions 3.4 or greater are supported, c++14 support is required.')
if cxx.version < 1914:
raise Exception('Only MSVC 2017 15.7 and later are supported, full C++17 support is required.')
elif cxx.family == 'gcc':
if cxx.version < 'gcc-9':
raise Exception('Only GCC versions 9 or later are supported, full C++17 support is required.')
elif cxx.family == 'clang':
if cxx.version < 'clang-5':
raise Exception('Only clang versions 5 or later are supported, full C++17 support is required.')
if cxx.like('gcc'):
self.configure_gcc(cxx)
@ -317,15 +317,13 @@ class SMConfig(object):
'-fvisibility=hidden',
]
if cxx.version == 'apple-clang-6.0' or cxx.version == 'clang-3.4':
cxx.cxxflags += ['-std=c++1y']
else:
cxx.cxxflags += ['-std=c++14']
cxx.cxxflags += ['-std=c++17']
cxx.cxxflags += [
'-fno-threadsafe-statics',
'-Wno-non-virtual-dtor',
'-Wno-overloaded-virtual',
'-Wno-register',
'-fvisibility-inlines-hidden',
]
@ -402,6 +400,7 @@ class SMConfig(object):
'/EHsc',
'/GR-',
'/TP',
'/std:c++17',
]
cxx.linkflags += [
'kernel32.lib',

2
extensions/sdktools/AMBuilder
View File

@ -37,6 +37,8 @@ project.sources += [
for sdk_name in SM.sdks:
sdk = SM.sdks[sdk_name]
if sdk.name in ['mock']:
continue
for cxx in builder.targets:
if not cxx.target.arch in sdk.platformSpec[cxx.target.platform]: