yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #17 from spycrab/bindir 

CMake: Output binaries to bin/
This commit is contained in:
bunnei 2018-01-15 12:56:58 -05:00 committed by GitHub
parent 054d3e5fc3 8a440faa69
commit 67c8b671d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/linux/upload.sh
View File

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

4
.travis/macos/upload.sh
View File

@ -8,8 +8,8 @@ COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/yuzu_cmd/yuzu-cmd "$REV_NAME" cp build/bin/yuzu-cmd "$REV_NAME"
cp -r build/src/yuzu/yuzu.app "$REV_NAME" cp -r build/bin/yuzu.app "$REV_NAME"
# move qt libs into app bundle for deployment # move qt libs into app bundle for deployment
$(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/yuzu.app"

3
CMakeLists.txt
View File

@ -166,6 +166,9 @@ if (NOT Boost_FOUND)
find_package(Boost QUIET REQUIRED) find_package(Boost QUIET REQUIRED)
endif() endif()
# Output binaries to bin/
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
# Prefer the -pthread flag on Linux. # Prefer the -pthread flag on Linux.
set(THREADS_PREFER_PTHREAD_FLAG ON) set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)