diff options
| author | spycrab <spycrab@users.noreply.github.com> | 2018-01-15 10:42:40 +0100 |
|---|---|---|
| committer | spycrab <spycrab@users.noreply.github.com> | 2018-01-15 13:47:38 +0100 |
| commit | 8a440faa6901e91a0e81177bcf68431f91e03fae (patch) | |
| tree | 0cf56c61b6f5ca46c58a91142037fd1498193dc1 | |
| parent | Merge pull request #7 from JayFoxRox/remove-surface-viewer (diff) | |
| download | yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar.gz yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar.bz2 yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar.lz yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar.xz yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.tar.zst yuzu-8a440faa6901e91a0e81177bcf68431f91e03fae.zip | |
| -rwxr-xr-x | .travis/linux/upload.sh | 4 | ||||
| -rwxr-xr-x | .travis/macos/upload.sh | 4 | ||||
| -rw-r--r-- | CMakeLists.txt | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 8a029bbe2..61842be12 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -8,7 +8,7 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" -cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" -cp build/src/yuzu/yuzu "$REV_NAME" +cp build/bin/yuzu-cmd "$REV_NAME" +cp build/bin/yuzu "$REV_NAME" . .travis/common/post-upload.sh diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index de0ba91f1..9ba95086b 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" -cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" -cp -r build/src/yuzu/yuzu.app "$REV_NAME" +cp build/bin/yuzu-cmd "$REV_NAME" +cp -r build/bin/yuzu.app "$REV_NAME" # move qt libs into app bundle for deployment $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" diff --git a/CMakeLists.txt b/CMakeLists.txt index 09fe9bcd3..791a3357f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,6 +160,9 @@ if (NOT Boost_FOUND) find_package(Boost QUIET REQUIRED) endif() +# Output binaries to bin/ +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + # Prefer the -pthread flag on Linux. set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) |