ardour/livetrax
13
0
Fork 0
Code

Add support for El Capitan

Browse Source
This commit is contained in:
David 2015-12-10 19:27:51 +01:00 committed by Robin Gareus
parent 5630332797
commit 0e1ce02941
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wscript
View File

@ -342,6 +342,8 @@ int main() { return 0; }''',
conf.env['build_host'] = 'mavericks' conf.env['build_host'] = 'mavericks'
elif re.search ("^14[.]", version) != None: elif re.search ("^14[.]", version) != None:
conf.env['build_host'] = 'yosemite' conf.env['build_host'] = 'yosemite'
elif re.search ("^15[.]", version) != None:
conf.env['build_host'] = 'el_capitan'
else: else:
conf.env['build_host'] = 'irrelevant' conf.env['build_host'] = 'irrelevant'
@ -363,8 +365,10 @@ int main() { return 0; }''',
conf.env['build_target'] = 'mountainlion' conf.env['build_target'] = 'mountainlion'
elif re.search ("^13[.]", version) != None: elif re.search ("^13[.]", version) != None:
conf.env['build_target'] = 'mavericks' conf.env['build_target'] = 'mavericks'
else: elif re.search ("^14[.]", version) != None:
conf.env['build_target'] = 'yosemite' conf.env['build_target'] = 'yosemite'
else:
conf.env['build_target'] = 'el_capitan'
else: else:
match = re.search( match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)", "(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
@ -385,7 +389,7 @@ int main() { return 0; }''',
# #
compiler_flags.append ('-U__STRICT_ANSI__') compiler_flags.append ('-U__STRICT_ANSI__')
if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite' ]: if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
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 platform == "darwin": if platform == "darwin":
@ -399,7 +403,7 @@ int main() { return 0; }''',
else: else:
cxx_flags.append('-DBOOST_NO_AUTO_PTR') cxx_flags.append('-DBOOST_NO_AUTO_PTR')
if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite']: if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite', 'el_capitan']:
# Silence warnings about the non-existing osx clang compiler flags # Silence warnings about the non-existing osx clang compiler flags
# -compatibility_version and -current_version. These are Waf # -compatibility_version and -current_version. These are Waf
# generated and not needed with clang # generated and not needed with clang
@ -511,7 +515,7 @@ int main() { return 0; }''',
("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070", ("-DMAC_OS_X_VERSION_MIN_REQUIRED=1070",
'-mmacosx-version-min=10.7')) '-mmacosx-version-min=10.7'))
elif conf.env['build_target'] in [ 'mavericks', 'yosemite' ]: elif conf.env['build_target'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
compiler_flags.extend( compiler_flags.extend(
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090", ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.8")) "-mmacosx-version-min=10.8"))