diff options
| author | bunnei <bunneidev@gmail.com> | 2018-01-15 18:56:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-15 18:56:58 +0100 |
| commit | 67c8b671d251e774f8d761c8ef22b3544b25465c (patch) | |
| tree | 9b375bd319eb12676450e3ca724b7ffd43fa03e2 | |
| parent | Merge pull request #20 from Andrix44/fixes (diff) | |
| parent | CMake: Output binaries to bin/ (diff) | |
| download | yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar.gz yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar.bz2 yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar.lz yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar.xz yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.tar.zst yuzu-67c8b671d251e774f8d761c8ef22b3544b25465c.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 2af11a4e6..d60d1a5bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -166,6 +166,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) |