conf.env['build_host'] = 'yosemite'
elif re.search ("^15[.]", version) != None:
conf.env['build_host'] = 'el_capitan'
+ elif re.search ("^16[.]", version) != None:
+ conf.env['build_host'] = 'sierra'
else:
conf.env['build_host'] = 'irrelevant'
conf.env['build_target'] = 'mavericks'
elif re.search ("^14[.]", version) != None:
conf.env['build_target'] = 'yosemite'
- else:
+ elif re.search ("^15[.]", version) != None:
conf.env['build_target'] = 'el_capitan'
+ else:
+ conf.env['build_target'] = 'sierra'
else:
match = re.search(
"(?P<cpu>i[0-6]86|x86_64|powerpc|ppc|ppc64|arm|s390x?)",
#
compiler_flags.append ('-U__STRICT_ANSI__')
- if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan' ]:
+ if opt.use_libcpp or conf.env['build_host'] in [ 'el_capitan', 'sierra' ]:
cxx_flags.append('--stdlib=libc++')
linker_flags.append('--stdlib=libc++')
- if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan' ]:
+ if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra' ]:
conf.check_cxx(cxxflags=["-std=c++11"])
cxx_flags.append('-std=c++11')
if platform == "darwin":
# 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 [ 'el_capitan' ]:
+ if not opt.use_libcpp and not conf.env['build_host'] in [ 'el_capitan', 'sierra' ]:
cxx_flags.append('--stdlib=libstdc++')
linker_flags.append('--stdlib=libstdc++')
# Prevents visibility issues in standard headers
cxx_flags.append('-DBOOST_NO_AUTO_PTR')
- if (is_clang and platform == "darwin") or conf.env['build_host'] in ['mavericks', 'yosemite', 'el_capitan']:
+ if (is_clang and platform == "darwin") or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra' ]:
# Silence warnings about the non-existing osx clang compiler flags
# -compatibility_version and -current_version. These are Waf
# generated and not needed with clang
("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
"-mmacosx-version-min=10.8"))
+ elif conf.env['build_target'] in [ 'sierra' ]:
+ compiler_flags.extend(
+ ("-DMAC_OS_X_VERSION_MAX_ALLOWED=1090",
+ "-mmacosx-version-min=10.9"))
+
#
# save off CPU element in an env
#
help='Build internal libs as static libraries')
opt.add_option('--use-external-libs', action='store_true', default=False, dest='use_external_libs',
help='Use external/system versions of some bundled libraries')
+ opt.add_option('--keepflags', action='store_true', default=False, dest='keepflags',
+ help='Do not ignore CFLAGS/CXXFLAGS environment vars')
opt.add_option('--luadoc', action='store_true', default=False, dest='luadoc',
help='Compile Tool to dump LuaBindings (needs C++11)')
opt.add_option('--canvasui', action='store_true', default=False, dest='canvasui',
conf.env['MSVC_TARGETS'] = ['x64']
conf.load('msvc')
- if Options.options.debug:
+ if Options.options.debug and not Options.options.keepflags:
# Nuke user CFLAGS/CXXFLAGS if debug is set (they likely contain -O3, NDEBUG, etc)
conf.env['CFLAGS'] = []
conf.env['CXXFLAGS'] = []
print('')
if Options.options.dist_target == 'mingw' or Options.options.dist_target == 'msvc':
- create_resource_file(Options.options.program_name.lower())
+ create_resource_file(Options.options.program_name)
def build(bld):
create_stored_revision()
def test(bld):
subprocess.call("gtk2_ardour/artest")
+
+def help2man(bld):
+ cmd = "help2man -s 1 -N -o ardour.1 -n Ardour --version-string='Ardour %s' gtk2_ardour/ardev" % PROGRAM_VERSION
+ subprocess.call(cmd, shell=True)