diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 8a029bbe229c7d44388f3e79e4e89be1bc653cd9..61842be12637e7d539feb121608ef9b3d4a1e018 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 de0ba91f11ff01f7ef8608fa09784dcfdb7d20b6..9ba95086b02b11b82e0b07e40adf5de3772e209e 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 2af11a4e6628bd10a7fd7feaf061b8be08d6b5c0..d60d1a5bfc5b59f2b65b6946cbdae7d34abf8512 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)