Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-10-22 07:21:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

macOS: require 10.14 or newer

Browse Source 
Several functions of `std::optional` are only available
on Mojave (10.14) and newer, unfortunately.
This commit is contained in:
Moritz Bunkus 2019-12-31 16:08:55 +01:00
parent 080dfeda57
commit ce3bdf3c9d
No known key found for this signature in database
GPG Key ID: 74AF00ADF2E32C85
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ac/c++-features.m4
View File

@ -469,7 +469,7 @@ AC_DEFUN([AX_CXX17_STD_OPTIONAL],[
[
std::optional<int> moo;
moo = 42;
return moo.value_or(54);
return moo ? moo.value() : moo.value_or(54);
],
[ax_cv_cxx17_std_optional="yes"],
[ax_cv_cxx17_std_optional="no"])

2
packaging/macos/build.sh
View File

@ -487,7 +487,7 @@ MKVToolNix – macOS specific notes
Configuration files are stored in ~/.config/bunkus.org and temporary
files are stored in the folder automatically set via TMPDIR.
This build works only with macOS 10.12 "Sierra" or newer. Older
This build works only with macOS 10.14 "Mojave" or newer. Older
releases that work on older macOS versions can be found at
https://mkvtoolnix.download/downloads.html#macosx-old

2
packaging/macos/config.sh
View File

@ -11,7 +11,7 @@ export CXXCPP="clang++ -E"
export CFLAGS=""
export CXXFLAGS="-std=c++17"
export QT_CXXFLAGS="-stdlib=libc++"
export MACOSX_DEPLOYMENT_TARGET="10.9"
export MACOSX_DEPLOYMENT_TARGET="10.14"
export DRAKETHREADS=${DRAKETHREADS:-4}
export MAKEFLAGS="-j ${DRAKETHREADS}"
export SHARED_QT=1