diff --git a/tools/macos/build.sh b/tools/macos/build.sh index d92154356..79df5b58a 100755 --- a/tools/macos/build.sh +++ b/tools/macos/build.sh @@ -126,9 +126,10 @@ function build_qtbase { local -a args args=(--prefix=${TARGET} -opensource -confirm-license -release -c++std c++14 - -force-pkg-config -nomake examples -nomake tests + -force-pkg-config -pkg-config -nomake examples -nomake tests -no-glib -no-dbus -no-sql-mysql -no-sql-sqlite -no-sql-odbc -no-sql-psql -no-sql-tds - -no-openssl -no-cups -no-feature-cups -no-feature-printer + -no-openssl -no-cups -no-feature-cups + # -no-feature-printer -no-feature-printpreviewwidget -no-feature-printdialog -no-feature-printpreviewdialog) args+=(-no-framework) if [[ -z $SHARED_QT ]] args+=(-static) @@ -215,6 +216,39 @@ function build_qtmultimedia { CXXFLAGS=$saved_CXXFLAGS } +function build_qtsvg { + local saved_CXXFLAGS=$CXXFLAGS + export CXXFLAGS="${QT_CXXFLAGS}" + export QMAKE_CXXFLAGS="${CXXFLAGS}" + + CONFIGURE=qmake NO_MAKE=1 build_package qtsvg-opensource-src-${QTVER}.tar.xz + $DEBUG make + build_tarball command "make INSTALL_ROOT=TMPDIR install" + + CXXFLAGS=$saved_CXXFLAGS +} + +function build_qtimageformats { + local saved_CXXFLAGS=$CXXFLAGS + export CXXFLAGS="${QT_CXXFLAGS}" + export QMAKE_CXXFLAGS="${CXXFLAGS}" + + CONFIGURE=qmake NO_MAKE=1 build_package qtimageformats-opensource-src-${QTVER}.tar.xz + $DEBUG make + build_tarball command "make INSTALL_ROOT=TMPDIR install" + + CXXFLAGS=$saved_CXXFLAGS +} + +function build_qt { + build_qtbase + build_qtmultimedia + build_qtsvg + build_qtimageformats + build_qttools + build_qttranslations +} + function build_configured_mkvtoolnix { if [[ -z ${MTX_VER} ]] fail Variable MTX_VER not set @@ -413,10 +447,7 @@ if [[ -z $@ ]]; then build_zlib build_gettext build_boost - build_qtbase - build_qtmultimedia - build_qttools - build_qttranslations + build_qt build_ruby build_configured_mkvtoolnix diff --git a/tools/macos/config.sh b/tools/macos/config.sh index 7f3ed4d31..fbf42eb38 100644 --- a/tools/macos/config.sh +++ b/tools/macos/config.sh @@ -15,5 +15,5 @@ export MACOSX_DEPLOYMENT_TARGET="10.9" export DRAKETHREADS=${DRAKETHREADS:-4} export MAKEFLAGS="-j ${DRAKETHREADS}" export SHARED_QT=1 -export QTVER=${QTVER:-5.7.1} +export QTVER=${QTVER:-5.9.1} export SIGNATURE_IDENTITY="Mac Developer: Moritz Bunkus (R3F3XVNCQW)"