diff options
| author | bunnei <bunneidev@gmail.com> | 2016-03-19 00:05:56 -0400 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-03-19 00:05:56 -0400 |
| commit | 116194b14762ab8ced04fe541939d2ddd3fe2d38 (patch) | |
| tree | 7b89073def301103c5651202efed1413d59a9546 | |
| parent | 958b978efe1e297687b63c3b3b305519db72ba0f (diff) | |
| parent | 373a790d76b105f8066766f8d05ccd5001b18517 (diff) | |
Merge pull request #1522 from MerryMage/dylibbundler
OS X: Use dylibbundler to include dylibs required by citra in nightly build
| -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 ) elif [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update > /dev/null # silence the very verbose output - brew install qt5 sdl2 + brew install qt5 sdl2 dylibbundler gem install xcpretty 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 # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" + + # move SDL2 libs into folder for deployment + dylibbundler -b -x "${REV_NAME}/citra" -cd -d "${REV_NAME}/libs" -p "@executable_path/libs/" fi ARCHIVE_NAME="${REV_NAME}.tar.xz" |