From d275dcc2eecb74df0a715c2cacc398f499c4fa09 Mon Sep 17 00:00:00 2001 From: Vladimir Zidar Date: Fri, 29 Jan 2016 19:03:50 +0100 Subject: [PATCH] Fixed QT_DIR for OSX package build. --- package/Darwin.mk | 1 + package/osx/libraries | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/package/Darwin.mk b/package/Darwin.mk index bb37f397f..38284ed76 100644 --- a/package/Darwin.mk +++ b/package/Darwin.mk @@ -22,5 +22,6 @@ endif PACKAGE_DIR="$(PACKAGE_DIR)" \ PACKAGE_NAME="$(PACKAGE_NAME)" \ PACKAGE_SEP="$(PACKAGE_SEP)" \ + QT_DIR="$(QT_SDK_PREFIX)/lib" \ "$(ROOT_DIR)/package/osx/package" \ ) diff --git a/package/osx/libraries b/package/osx/libraries index b6ce04af2..78431fa5e 100755 --- a/package/osx/libraries +++ b/package/osx/libraries @@ -4,7 +4,6 @@ APP="${1?}" PLUGINS="${APP}/Contents/Plugins" OP_PLUGINS="${APP}/Contents/Plugins/OpenPilot" QT_LIBS="QtCore QtGui QtMultimedia QtMultimediaWidgets QtNetwork QtOpenGL QtPrintSupport QtQml QtQuick QtScript QtSerialPort QtSql QtSvg QtWidgets QtV8 QtXml" -QT_DIR=$(otool -L "${APP}/Contents/MacOS/${GCS_BIG_NAME}" | sed -n -e 's/\/QtCore\.framework.*//p' | sed -n -E 's:^.::p') QT_EXTRA="accessible/libqtaccessiblewidgets.dylib bearer/libqgenericbearer.dylib imageformats/libqgif.dylib imageformats/libqico.dylib imageformats/libqjpeg.dylib imageformats/libqmng.dylib imageformats/libqtiff.dylib imageformats/libqsvg.dylib qmltooling/libqmldbg_tcp.dylib sqldrivers/libqsqlodbc.dylib sqldrivers/libqsqlpsql.dylib sqldrivers/libqsqlite.dylib imageformats/libqtga.dylib iconengines/libqsvgicon.dylib" OSG_EXTRA="libosgViewer.90.dylib"