diff options
| author | 2016-03-14 21:23:07 +0000 | |
|---|---|---|
| committer | 2016-03-15 00:42:37 +0000 | |
| commit | 373a790d76b105f8066766f8d05ccd5001b18517 (patch) | |
| tree | ff650f50ba3b015600fedb19ac644744e350d607 | |
| parent | Merge pull request #1344 from LittleWhite-tb/error-output (diff) | |
| download | yuzu-373a790d76b105f8066766f8d05ccd5001b18517.tar.gz yuzu-373a790d76b105f8066766f8d05ccd5001b18517.tar.xz yuzu-373a790d76b105f8066766f8d05ccd5001b18517.zip | |
OS X: Use dylibbundler to include dylibs required by citra in nightly archive
| -rwxr-xr-x | .travis-deps.sh | 2 | ||||
| -rwxr-xr-x | .travis-upload.sh | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis-deps.sh b/.travis-deps.sh index bab90d307..eb99ead4f 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh | |||
| @@ -20,6 +20,6 @@ if [ "$TRAVIS_OS_NAME" = "linux" -o -z "$TRAVIS_OS_NAME" ]; then | |||
| 20 | ) | 20 | ) |
| 21 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then | 21 | elif [ "$TRAVIS_OS_NAME" = "osx" ]; then |
| 22 | brew update > /dev/null # silence the very verbose output | 22 | brew update > /dev/null # silence the very verbose output |
| 23 | brew install qt5 sdl2 | 23 | brew install qt5 sdl2 dylibbundler |
| 24 | gem install xcpretty | 24 | gem install xcpretty |
| 25 | fi | 25 | fi |
diff --git a/.travis-upload.sh b/.travis-upload.sh index e508386dd..d86775cb9 100755 --- a/.travis-upload.sh +++ b/.travis-upload.sh | |||
| @@ -20,6 +20,9 @@ if [ "$TRAVIS_BRANCH" = "master" ]; then | |||
| 20 | 20 | ||
| 21 | # move qt libs into app bundle for deployment | 21 | # move qt libs into app bundle for deployment |
| 22 | $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" | 22 | $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" |
| 23 | |||
| 24 | # move SDL2 libs into folder for deployment | ||
| 25 | dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" | ||
| 23 | fi | 26 | fi |
| 24 | 27 | ||
| 25 | ARCHIVE_NAME="${REV_NAME}.tar.xz" | 28 | ARCHIVE_NAME="${REV_NAME}.tar.xz" |