From 4f40625a0273896d9ad56c77e7aa60470da2fbc7 Mon Sep 17 00:00:00 2001 From: Syping Date: Thu, 14 May 2020 13:21:26 +0200 Subject: [PATCH] update qt_build --- qt_build | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/qt_build b/qt_build index a13faca..fc01150 100644 --- a/qt_build +++ b/qt_build @@ -48,11 +48,17 @@ fi # ----------- QT BUILD FLAGS ----------- if [ ! "${CUSTOM_QT_FLAGS}" == "YES" ]; then - QT_FLAGS="-qt-freetype -opengl desktop -skip qtactiveqt -skip qtconnectivity -skip qtlocation -skip qtmultimedia -skip qtwebengine -skip qtwebglplugin" + QT_FLAGS="-qt-freetype" +fi +if [ ! "${CUSTOM_QT_SKIP_FLAGS}" == "YES" ]; then + QT_SKIP_FLAGS="-skip qtactiveqt -skip qtconnectivity -skip qtlocation -skip qtmultimedia -skip qtwebengine -skip qtwebglplugin" fi if [ ! "${CUSTOM_QT_NOMAKE_FLAGS}" == "YES" ]; then QT_NOMAKE_FLAGS="-nomake tests -nomake examples" fi +if [ ! "${CUSTOM_QT_OPENGL_FLAGS}" == "YES" ]; then + QT_OPENGL_FLAGS="-opengl desktop" +fi if [ ! "${CUSTOM_QT_BUILDTYPE_FLAGS}" == "YES" ]; then QT_BUILDTYPE_FLAGS="-release" fi @@ -700,7 +706,7 @@ function qt_build { if [ -f "config.cache" ]; then rm -rf * fi - "${SOURCE_DIR_QT}/configure" -prefix "${PREFIX_DIR}/lib/${COMPILER}/qt_${QT_VERSION}${TARGET_SUFFIX}" -headerdir "${PREFIX_DIR}/include/qt_${QT_VERSION}" -datadir "${QT_SHARE_DIR}/qt_${QT_VERSION}" -sysconfdir "${QT_SYSCONF_DIR}" -device-option CROSS_COMPILE=${COMPILER}- -xplatform ${QT_XPLATFORM} ${QT_BUILDTYPE_FLAGS} -${TARGET_TYPE} ${QT_FLAGS} ${QT_LIBS_FLAGS} ${QT_NOMAKE_FLAGS} ${TARGET_FLAGS} -opensource -confirm-license ${QT_EXTRA_FLAGS} + "${SOURCE_DIR_QT}/configure" -prefix "${PREFIX_DIR}/lib/${COMPILER}/qt_${QT_VERSION}${TARGET_SUFFIX}" -headerdir "${PREFIX_DIR}/include/qt_${QT_VERSION}" -datadir "${QT_SHARE_DIR}/qt_${QT_VERSION}" -sysconfdir "${QT_SYSCONF_DIR}" -device-option CROSS_COMPILE=${COMPILER}- -xplatform ${QT_XPLATFORM} ${QT_BUILDTYPE_FLAGS} -${TARGET_TYPE} ${QT_FLAGS} ${QT_LIBS_FLAGS} ${QT_SKIP_FLAGS} ${QT_NOMAKE_FLAGS} ${QT_OPENGL_FLAGS} ${TARGET_FLAGS} -opensource -confirm-license ${QT_EXTRA_FLAGS} ${MAKE_GENERATOR} }