configure: get Qt include path through pkg-config on MacOS 53/29653/2
authorGiWoong Kim <giwoong.kim@samsung.com>
Fri, 31 Oct 2014 08:37:36 +0000 (17:37 +0900)
committerGiWoong Kim <giwoong.kim@samsung.com>
Fri, 31 Oct 2014 08:44:49 +0000 (17:44 +0900)
Change-Id: Ia8c85d595b41a40e25e73ddd30e3bbc86a779ad4
Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>
configure

index aa9212b709dc8923228a38bf22d321d15fdb1edd..5a076cdc1aa367394e12235911a17536630184a1 100755 (executable)
--- 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"