qmake|Mac OS X: Tweaked deployment of shared libraries

skyjake · Jan 29, 2013 · 7b95f97 · 7b95f97
1 parent 073ead0
commit 7b95f97
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -709,10 +709,6 @@ macx {
         doPostLink("install_name_tool -id @executable_path/../Frameworks/libfmodex.dylib $${FW_DIR}libfmodex.dylib")
     }
 
-    # libdeng1 and 2 dynamic libraries.
-    doPostLink("cp -fRp $$OUT_PWD/../libdeng2/libdeng2*dylib $$FW_DIR")
-    doPostLink("cp -fRp $$OUT_PWD/../libdeng1/libdeng1*dylib $$FW_DIR")
-
     # Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle.
     fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng2.2.dylib, ..)
     fixInstallName(Doomsday.app/Contents/MacOS/Doomsday, libdeng1.1.dylib, ..)

diff --git a/doomsday/config.pri b/doomsday/config.pri
@@ -43,10 +43,6 @@ DENG_INCLUDE_DIR      = $$PWD/client/include
 DENG_UNIX_INCLUDE_DIR = $$DENG_INCLUDE_DIR/unix
 DENG_MAC_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/macx
 DENG_WIN_INCLUDE_DIR  = $$DENG_INCLUDE_DIR/windows
-
-# Binaries and generated files are placed here.
-DENG_WIN_PRODUCTS_DIR = $$PWD/../distrib/products
-
 DENG_MODULES_DIR      = $$PWD/libdeng2/modules
 
 # Versions -------------------------------------------------------------------

diff --git a/doomsday/config_win32.pri b/doomsday/config_win32.pri
@@ -13,6 +13,8 @@ DEFINES += WIN32 _CRT_SECURE_NO_WARNINGS _USE_MATH_DEFINES
 QMAKE_CFLAGS += -w14505
 QMAKE_CXXFLAGS += -w14505
 
+DENG_WIN_PRODUCTS_DIR = $$PWD/../distrib/products
+
 # Install locations:
 DENG_BASE_DIR       = $$DENG_WIN_PRODUCTS_DIR
 DENG_BIN_DIR        = $$DENG_BASE_DIR/bin

diff --git a/doomsday/postbuild/bundleapp.sh b/doomsday/postbuild/bundleapp.sh
@@ -23,6 +23,11 @@ echo "Bundle directory: $APPDIR"
 echo "Clearing existing bundles..."
 rm -rf $BUILDDIR/*.bundle
 
+echo "Copying shared libraries..."
+$CP $BUILDDIR/../libdeng2/libdeng2*dylib      $APPDIR/Frameworks
+$CP $BUILDDIR/../libdeng1/libdeng1*dylib      $APPDIR/Frameworks
+$CP $BUILDDIR/../libshell/libdeng_shell*dylib $APPDIR/Frameworks
+
 echo "Copying server..."
 $CP server/doomsday-server $APPDIR/Resources