midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2982 from MerryMage/lazy-macos-opt

Browse Source 
macOS: Build x86_64h slice
This commit is contained in:
James Rowe 2017-10-03 11:15:01 -06:00 committed by GitHub
commit 26629c661c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis-build.sh
View File

@ -52,8 +52,8 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
export Qt5_DIR=$(brew --prefix)/opt/qt5 export Qt5_DIR=$(brew --prefix)/opt/qt5
mkdir build && cd build mkdir build && cd build
cmake .. -DUSE_SYSTEM_CURL=ON -GXcode cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release
xcodebuild -configuration Release make -j4
ctest -VV -C Release ctest -VV -C Release
fi fi

4
.travis-upload.sh
View File

@ -16,8 +16,8 @@ elif [ "$TRAVIS_OS_NAME" = "osx" ]; then
COMPRESSION_FLAGS="-czvf" COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/citra/Release/citra "$REV_NAME" cp build/src/citra/citra "$REV_NAME"
cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME" cp -r build/src/citra_qt/citra-qt.app "$REV_NAME"
# move qt libs into app bundle for deployment # move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"