mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-09-04 21:29:01 +00:00
Merge pull request #17 from spycrab/bindir
CMake: Output binaries to bin/
This commit is contained in:
commit
67c8b671d2
@ -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
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user