diff --git a/.travis/linux/upload.sh b/.travis/linux/upload.sh index 548ee4905..c40c0d71e 100755 --- a/.travis/linux/upload.sh +++ b/.travis/linux/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-cJvf" mkdir "$REV_NAME" -cp build/bin/citra "$REV_NAME" -cp build/bin/citra-room "$REV_NAME" -cp build/bin/citra-qt "$REV_NAME" +cp build/bin/Release/citra "$REV_NAME" +cp build/bin/Release/citra-room "$REV_NAME" +cp build/bin/Release/citra-qt "$REV_NAME" # We need icons on Linux for .desktop entries mkdir "$REV_NAME/dist" diff --git a/.travis/macos/upload.sh b/.travis/macos/upload.sh index bdd7d7da7..05760c0b4 100755 --- a/.travis/macos/upload.sh +++ b/.travis/macos/upload.sh @@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" -cp build/bin/citra "$REV_NAME" -cp -r build/bin/citra-qt.app "$REV_NAME" -cp build/bin/citra-room "$REV_NAME" +cp build/bin/Release/citra "$REV_NAME" +cp -r build/bin/Release/citra-qt.app "$REV_NAME" +cp build/bin/Release/citra-room "$REV_NAME" # move libs into folder for deployment macpack "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -d "../Frameworks" diff --git a/CMakeLists.txt b/CMakeLists.txt index 927e77dfe..3537e8d28 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -126,7 +126,7 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) # set up output paths for executable binaries -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin/$) # System imported libraries