ardour/livetrax
13
0
Fork 0
Code

Add C++17 option to force compiles to use std=cxx17

Browse Source
This commit is contained in:
Robin Gareus 2024-09-14 16:05:47 +02:00
parent 1f70d54989
commit 0ed82d2f50
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
wscript
View File

@ -566,9 +566,14 @@ int main() { return 0; }''',
cxx_flags.append('--stdlib=libc++') cxx_flags.append('--stdlib=libc++')
linker_flags.append('--stdlib=libc++') linker_flags.append('--stdlib=libc++')
if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura', 'sonoma' ]: if conf.options.cxx17 or conf.env['build_host'] in [ 'bigsur', 'monterey', 'ventura', 'sonoma' ]:
conf.check_cxx(cxxflags=["-std=c++17"])
cxx_flags.append('-std=c++17')
elif conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]:
conf.check_cxx(cxxflags=["-std=c++11"]) conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11') cxx_flags.append('-std=c++11')
if conf.options.cxx11 or conf.options.cxx17 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura', 'sonoma' ]:
if platform == "darwin": if platform == "darwin":
# Mavericks and later changed the syntax to be used when including Carbon headers, # Mavericks and later changed the syntax to be used when including Carbon headers,
# from requiring a full path to requiring just the header name. # from requiring a full path to requiring just the header name.
@ -960,6 +965,8 @@ def options(opt):
help='Do not ask questions that require confirmation during the build') help='Do not ask questions that require confirmation during the build')
opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11', opt.add_option('--cxx11', action='store_true', default=False, dest='cxx11',
help='Turn on c++11 compiler flags (-std=c++11)') help='Turn on c++11 compiler flags (-std=c++11)')
opt.add_option('--cxx17', action='store_true', default=False, dest='cxx17',
help='Turn on c++17 compiler flags (-std=c++17)')
opt.add_option('--use-libc++', action='store_true', default=False, dest='use_libcpp', opt.add_option('--use-libc++', action='store_true', default=False, dest='use_libcpp',
help='Use libc++ instead of default or auto-detected stdlib') help='Use libc++ instead of default or auto-detected stdlib')
opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan', opt.add_option('--address-sanitizer', action='store_true', default=False, dest='asan',
@ -1267,7 +1274,7 @@ int main () { int x = SFC_RF64_AUTO_DOWNGRADE; return 0; }
conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CFLAGS', '-DCOMPILER_MINGW')
conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS') conf.env.append_value('CXXFLAGS', '-DPLATFORM_WINDOWS')
conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW') conf.env.append_value('CXXFLAGS', '-DCOMPILER_MINGW')
if conf.options.cxx11: if conf.options.cxx11 or conf.options.cxx17:
conf.env.append_value('CFLAGS', '-D_USE_MATH_DEFINES') conf.env.append_value('CFLAGS', '-D_USE_MATH_DEFINES')
conf.env.append_value('CXXFLAGS', '-D_USE_MATH_DEFINES') conf.env.append_value('CXXFLAGS', '-D_USE_MATH_DEFINES')
conf.env.append_value('CFLAGS', '-DWIN32') conf.env.append_value('CFLAGS', '-DWIN32')