diff options
| author | MerryMage <MerryMage@users.noreply.github.com> | 2017-10-02 09:43:30 +0100 |
|---|---|---|
| committer | MerryMage <MerryMage@users.noreply.github.com> | 2017-10-02 18:34:19 +0100 |
| commit | 29a6fbacd5cfb4ca91466ddb099cb0cc3c3c4632 (patch) | |
| tree | 6f3b06f8c98a6c4bde08fbfc46e6ead38abc337d | |
| parent | 30fabc41c60b08af20b6eaf719d012b7480d7123 (diff) | |
macOS: Build x86_64h slice
This commit produces a fat-binary with two slices. The x86_64 slice
is for all x64 systems, and the x86_64h slice targets x64 systems
starting with Haswell. The latter allows the compiler to use newer
instructions that are not available on older microarchitectures.
| -rwxr-xr-x | .travis-build.sh | 4 | ||||
| -rwxr-xr-x | .travis-upload.sh | 4 |
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 export Qt5_DIR=$(brew --prefix)/opt/qt5 mkdir build && cd build - cmake .. -DUSE_SYSTEM_CURL=ON -GXcode - xcodebuild -configuration Release + cmake .. -DUSE_SYSTEM_CURL=ON -DCMAKE_OSX_ARCHITECTURES="x86_64;x86_64h" -DCMAKE_BUILD_TYPE=Release + make -j4 ctest -VV -C Release fi 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 COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" - cp build/src/citra/Release/citra "$REV_NAME" - cp -r build/src/citra_qt/Release/citra-qt.app "$REV_NAME" + cp build/src/citra/citra "$REV_NAME" + cp -r build/src/citra_qt/citra-qt.app "$REV_NAME" # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app" |