ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Add Monterey as a mac build target

This commit is contained in:
ardour 2022-04-25 08:08:50 -05:00
parent f8a0de5928
commit edf1f55781
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
wscript
View File

@ -434,6 +434,8 @@ int main() { return 0; }''',
conf.env['build_host'] = 'catalina'
elif re.search ("^20[.]", version) is not None:
conf.env['build_host'] = 'bigsur'
elif re.search ("^21[.]", version) is not None:
conf.env['build_host'] = 'monterey'
else:
conf.env['build_host'] = 'irrelevant'
@ -469,6 +471,8 @@ int main() { return 0; }''',
conf.env['build_target'] = 'catalina'
elif re.search ("^20[.]", version) is not None:
conf.env['build_target'] = 'bigsur'
elif re.search ("^21[.]", version) is not None:
conf.env['build_target'] = 'monterey'
else:
conf.env['build_target'] = 'catalina'
else:
@ -512,7 +516,7 @@ int main() { return 0; }''',
cxx_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' ]:
if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey' ]:
conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11')
if platform == "darwin":
@ -520,7 +524,7 @@ int main() { return 0; }''',
# from requiring a full path to requiring just the header name.
cxx_flags.append('-DCARBON_FLAT_HEADERS')
if not opt.use_libcpp and not conf.env['build_host'] in [ 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina', 'bigsur' ]:
if not opt.use_libcpp and not conf.env['build_host'] in [ 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina', 'bigsur', 'monterey' ]:
cxx_flags.append('--stdlib=libstdc++')
linker_flags.append('--stdlib=libstdc++')
# Prevents visibility issues in standard headers
@ -529,7 +533,7 @@ int main() { return 0; }''',
cxx_flags.append('-DBOOST_NO_AUTO_PTR')
cxx_flags.append('-DBOOST_BIND_GLOBAL_PLACEHOLDERS')
if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur' ]:
if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey' ]:
# Silence warnings about the non-existing osx clang compiler flags
# -compatibility_version and -current_version. These are Waf
# generated and not needed with clang
@ -659,6 +663,12 @@ int main() { return 0; }''',
"-mmacosx-version-min=11.0"))
linker_flags.append("-mmacosx-version-min=11.0")
elif conf.env['build_target'] in ['monterey']:
compiler_flags.extend(
("-DMAC_OS_X_VERSION_MAX_ALLOWED=110000",
"-mmacosx-version-min=11.0"))
linker_flags.append("-mmacosx-version-min=11.0")
#
# save off CPU element in an env
#
@ -1382,7 +1392,7 @@ int main () { return 0; }
set_compiler_flags (conf, Options.options)
if sys.platform == 'darwin':
if conf.env['build_host'] not in [ 'mojave', 'catalina', 'bigsur']:
if conf.env['build_host'] not in [ 'mojave', 'catalina', 'bigsur', 'monterey']:
conf.env.append_value('CXXFLAGS_OSX', '-F/System/Library/Frameworks')
conf.env.append_value('CXXFLAGS_OSX', '-F/Library/Frameworks')