Просмотр исходного кода

Merge pull request #1522 from MerryMage/dylibbundler

OS X: Use dylibbundler to include dylibs required by citra in nightly build
bunnei 10 лет назад
Родитель
Сommit
116194b147
2 измененных файлов с 4 добавлено и 1 удалено
  1. 1 1
      .travis-deps.sh
  2. 3 0
      .travis-upload.sh

+ 1 - 1
.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

+ 3 - 0
.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"