From e8090568ded16f6c419f4735bc0e626df10d016c Mon Sep 17 00:00:00 2001 From: GiWoong Kim Date: Fri, 31 Oct 2014 17:37:36 +0900 Subject: [PATCH] configure: get Qt include path through pkg-config on MacOS Change-Id: Ia8c85d595b41a40e25e73ddd30e3bbc86a779ad4 Signed-off-by: GiWoong Kim --- configure | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/configure b/configure index aa9212b709..5a076cdc1a 100755 --- a/configure +++ b/configure @@ -601,8 +601,8 @@ Darwin) cocoa="yes" audio_drv_list="coreaudio" audio_possible_drivers="coreaudio sdl fmod" - QT_PATH="/opt/local/Library/Frameworks" - CFLAGS="-F$QT_PATH -I$QT_PATH/QtCore.framework/Headers -I$QT_PATH/QtWidgets.framework/Headers -I$QT_PATH/QtGui.framework/Headers -I$QT_PATH/QtGui.framework/Headers/5.3.1/QtGui -I$QT_PATH/QtQML.framework/Headers -I$QT_PATH/QtOpenGL.framework/Headers $CFLAGS" +# QT_PATH="/opt/local/Library/Frameworks" +# CFLAGS="-F$QT_PATH -I$QT_PATH/QtCore.framework/Headers -I$QT_PATH/QtWidgets.framework/Headers -I$QT_PATH/QtGui.framework/Headers -I$QT_PATH/QtGui.framework/Headers/5.3.1/QtGui -I$QT_PATH/QtQML.framework/Headers -I$QT_PATH/QtOpenGL.framework/Headers $CFLAGS" LDFLAGS="-framework CoreFoundation -framework IOKit $LDFLAGS" libs_softmmu="-F/System/Library/Frameworks -framework Cocoa -framework IOKit $libs_softmmu" # Disable attempts to use ObjectiveC features in os/object.h since they @@ -2096,8 +2096,14 @@ if test "$qt" != "no"; then qt_cflags=`$pkg_config --cflags $qtpackage` qt_libs=`$pkg_config --libs $qtpackage` libs_softmmu="$qt_libs $libs_softmmu" + qt_cflags_private=`pkg-config --modversion Qt5Gui` - qt_cflags_private=`pkg-config --cflags Qt5Gui | sed "s,QtGui,QtGui/$qt_cflags_private/QtGui,g"` + if test "$darwin" = "yes" ; then + qt_cflags_private=`pkg-config --cflags Qt5Gui | sed "s,QtGui.framework/Headers,&/$qt_cflags_private/QtGui,g"` + else + qt_cflags_private=`pkg-config --cflags Qt5Gui | sed "s,QtGui,&/$qt_cflags_private/QtGui,g"` + fi + qt_cflags="$qt_cflags $qt_cflags_private" if test "$mingw32" = "no" ; then qt_cflags="$qt_cflags -fPIC" -- 2.34.1