From 40546a6d671b9c956909d86b62f8dd59ce88482a Mon Sep 17 00:00:00 2001 From: baldurk Date: Thu, 7 Mar 2019 10:55:54 +0000 Subject: [PATCH] symlink qtplugins folder in local macOS builds --- qrenderdoc/qrenderdoc.pro | 2 ++ util/buildscripts/scripts/prepare_deps_macos.sh | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index e6f757aa3..413ea10fa 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -147,7 +147,9 @@ win32 { QMAKE_BUNDLE_DATA += librd INFO_PLIST_PATH = $$shell_quote($$DESTDIR/$${TARGET}.app/Contents/Info.plist) + QTPLUGINS_PATH = $$shell_quote($$DESTDIR/$${TARGET}.app/Contents/qtplugins) QMAKE_POST_LINK += $$_PRO_FILE_PWD_/../util/set_plist_version.sh $${RENDERDOC_VERSION}.0 $${INFO_PLIST_PATH} + QMAKE_POST_LINK += ln -sf $$[QT_INSTALL_PLUGINS] $${QTPLUGINS_PATH} } else { QT += x11extras DEFINES += RENDERDOC_PLATFORM_POSIX RENDERDOC_PLATFORM_LINUX RENDERDOC_WINDOWING_XLIB RENDERDOC_WINDOWING_XCB diff --git a/util/buildscripts/scripts/prepare_deps_macos.sh b/util/buildscripts/scripts/prepare_deps_macos.sh index 944353a0e..055624fd0 100755 --- a/util/buildscripts/scripts/prepare_deps_macos.sh +++ b/util/buildscripts/scripts/prepare_deps_macos.sh @@ -47,6 +47,11 @@ qt_install=`dirname "${first_dep_loC}" | sed 's#/lib##'` echo "Copying plugins from $qt_install" plugins="imageformats/libqsvg.dylib platforms/libqcocoa.dylib" +# Remove any symlink that might exist here +if [ -L Contents/qtplugins ]; then + rm Contents/qtplugins; +fi + for plugin in $plugins; do mkdir -p "Contents/qtplugins/"`dirname "${plugin}"`