summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex James <theracermaster@gmail.com>2019-03-09 15:05:56 +0100
committerfearlessTobi <thm.frey@gmail.com>2019-03-23 01:37:38 +0100
commita5dbda3f765a063d56df3f0b83304010b0a19df7 (patch)
tree2b82b1fa39d7b81bca6ced18fa0afabac6fe9969
parenttravis: Simplify macos/upload.sh (diff)
downloadyuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar.gz
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar.bz2
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar.lz
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar.xz
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.tar.zst
yuzu-a5dbda3f765a063d56df3f0b83304010b0a19df7.zip
-rwxr-xr-x.travis/macos/deps.sh3
-rwxr-xr-x.travis/macos/upload.sh4
2 files changed, 4 insertions, 3 deletions
diff --git a/.travis/macos/deps.sh b/.travis/macos/deps.sh
index 1a547c060..faeafa216 100755
--- a/.travis/macos/deps.sh
+++ b/.travis/macos/deps.sh
@@ -1,5 +1,6 @@
#!/bin/sh -ex
brew update
-brew install dylibbundler p7zip qt5 sdl2 ccache
+brew install p7zip qt5 sdl2 ccache
brew outdated cmake || brew upgrade cmake
+pip3 install macpack
diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh
index 965e9e794..66e3455ff 100755
--- a/.travis/macos/upload.sh
+++ b/.travis/macos/upload.sh
@@ -12,12 +12,12 @@ cp build/bin/yuzu-cmd "$REV_NAME"
cp -r build/bin/yuzu.app "$REV_NAME"
# move libs into folder for deployment
-dylibbundler -b -x "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -cd -d "${REV_NAME}/yuzu.app/Contents/Frameworks/" -p "@executable_path/../Frameworks/" -of
+macpack "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -d "../Frameworks"
# move qt frameworks into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" -executable="${REV_NAME}/yuzu.app/Contents/MacOS/yuzu"
# move libs into folder for deployment
-dylibbundler -b -x "${REV_NAME}/yuzu-cmd" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/"
+macpack "${REV_NAME}/yuzu-cmd" -d "libs"
# Make the yuzu.app application launch a debugging terminal.
# Store away the actual binary