Skip to content

Commit

Permalink
Fixed|Tests|OS X: Deployment of the GLSandbox test app (on Qt 5)
Browse files Browse the repository at this point in the history
This is a kludge. The proper way would be to use macdeployqt to deploy
the app on its other, rather than borrowing stuff from Doomsday.app.
  • Loading branch information
skyjake committed Apr 30, 2014
1 parent 30ff45c commit ba07016
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions doomsday/tests/config_test.pri
Expand Up @@ -12,13 +12,13 @@ macx {
mod.path = Contents/Resources/modules

defineTest(deployTest) {
fwDir = \"$${OUT_PWD}/$${1}.app/Contents/Frameworks\"
contDir = $${OUT_PWD}/$${1}.app/Contents
fwDir = \"$$contDir/Frameworks\"
# Quite a hack: directly use the client's Frameworks folder.
doPostLink("rm -rf $$fwDir")
doPostLink("ln -s \"$$OUT_PWD/../../client/Doomsday.app/Contents/Frameworks\" $$fwDir")
#doPostLink("mkdir $$fwDir")
#doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.dylib $$fwDir/libdeng2.dylib")
#doPostLink("ln -s $$OUT_PWD/../../libdeng2/libdeng2.2.dylib $$fwDir/libdeng2.2.dylib")
doPostLink("ln -sf \"$$OUT_PWD/../../client/Doomsday.app/Contents/PlugIns\" \"$$contDir/PlugIns\"")
doPostLink("ln -sf \"$$OUT_PWD/../../client/Doomsday.app/Contents/Resources/qt.conf\" \"$$contDir/Resources/qt.conf\"")

# Fix the dynamic linker paths so they point to ../Frameworks/ inside the bundle.
fixInstallName($${1}.app/Contents/MacOS/$${1}, libdeng2.2.dylib, ..)
Expand Down

0 comments on commit ba07016

Please sign in to comment.