summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-x.travis-build.sh4
-rwxr-xr-x.travis-upload.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/.travis-build.sh b/.travis-build.sh
index bb4e6fc47..fc5a5f8b2 100755
--- a/.travis-build.sh
+++ b/.travis-build.sh
@@ -52,8 +52,8 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
52 export Qt5_DIR=$(brew --prefix)/opt/qt5 52 export Qt5_DIR=$(brew --prefix)/opt/qt5
53 53
54 mkdir build && cd build 54 mkdir build && cd build
55 cmake .. -DUSE_SYSTEM_CURL=ON -GXcode 55 cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release
56 xcodebuild -configuration Release 56 make -j4
57 57
58 ctest -VV -C Release 58 ctest -VV -C Release
59fi 59fi
diff --git a/.travis-upload.sh b/.travis-upload.sh
index 8c1fa21c5..edf195f7d 100755
--- a/.travis-upload.sh
+++ b/.travis-upload.sh
@@ -16,8 +16,8 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
16 COMPRESSION_FLAGS="-czvf" 16 COMPRESSION_FLAGS="-czvf"
17 mkdir "$REV_NAME" 17 mkdir "$REV_NAME"
18 18
19 cp build/src/citra/Release/citra "$REV_NAME" 19 cp build/src/citra/citra "$REV_NAME"
20 cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME" 20 cp -r build/src/citra_qt/citra-qt.app "$REV_NAME"
21 21
22 # move qt libs into app bundle for deployment 22 # move qt libs into app bundle for deployment
23 $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" 23 $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"