Compare commits

...

3 Commits

Author SHA1 Message Date
Dragios
6f03adec89 Try to fix executable path generated in CI 2020-07-18 16:34:59 +02:00
Dragios
cc80fc9fda Correct output paths for executable binaries 2020-07-18 16:30:56 +02:00
MerryMage
7cc0c82b78 travis: Compile on macOS 10.13 with more up to date compiler 2020-07-18 16:29:11 +02:00
6 changed files with 13 additions and 8 deletions

View File

@@ -24,7 +24,7 @@ matrix:
- os: osx
env: NAME="macos build"
sudo: false
osx_image: xcode10.2
osx_image: xcode10
install: "./.travis/macos/deps.sh"
script: "./.travis/macos/build.sh"
after_success: "./.travis/macos/upload.sh"

View File

@@ -8,7 +8,7 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME"
cp build/bin/yuzu-cmd "$REV_NAME"
cp build/bin/yuzu "$REV_NAME"
cp build/bin/Release/yuzu-cmd "$REV_NAME"
cp build/bin/Release/yuzu "$REV_NAME"
. .travis/common/post-upload.sh

View File

@@ -5,7 +5,12 @@ set -o pipefail
export MACOSX_DEPLOYMENT_TARGET=10.14
export Qt5_DIR=$(brew --prefix)/opt/qt5
export UNICORNDIR=$(pwd)/externals/unicorn
export PATH="/usr/local/opt/ccache/libexec:$PATH"
export PATH="/usr/local/opt/ccache/libexec:/usr/local/opt/llvm/bin:$PATH"
export CC="clang"
export CXX="clang++"
export LDFLAGS="-L/usr/local/opt/llvm/lib"
export CPPFLAGS="-I/usr/local/opt/llvm/include"
# TODO: Build using ninja instead of make
mkdir build && cd build

View File

@@ -1,6 +1,6 @@
#!/bin/sh -ex
brew update
brew install p7zip qt5 sdl2 ccache
brew install p7zip qt5 sdl2 ccache llvm
brew outdated cmake || brew upgrade cmake
pip3 install macpack

View File

@@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME"
cp build/bin/yuzu-cmd "$REV_NAME"
cp -r build/bin/yuzu.app "$REV_NAME"
cp build/bin/Release/yuzu-cmd "$REV_NAME"
cp -r build/bin/Release/yuzu.app "$REV_NAME"
# move libs into folder for deployment
macpack "${REV_NAME}/yuzu.app/Contents/MacOS/yuzu" -d "../Frameworks"

View File

@@ -132,7 +132,7 @@ else()
endif()
# Output binaries to bin/
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$<CONFIG>)
# System imported libraries
# If not found, download any missing through Conan