octo
/
citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4263 from spycrab/cmake_bin 

cmake: Output binaries to bin on every platform
This commit is contained in:
James Rowe 2018-09-25 12:27:22 -06:00 committed by GitHub
parent d6a9b01624 fb3af43444
commit 9518a2d814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis/linux/upload.sh
View File

@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-cJvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/citra/citra "$REV_NAME" cp build/bin/citra "$REV_NAME"
cp build/src/dedicated_room/citra-room "$REV_NAME" cp build/bin/citra-room "$REV_NAME"
cp build/src/citra_qt/citra-qt "$REV_NAME" cp build/bin/citra-qt "$REV_NAME"
# We need icons on Linux for .desktop entries # We need icons on Linux for .desktop entries
mkdir "$REV_NAME/dist" mkdir "$REV_NAME/dist"

6
.travis/macos/upload.sh
View File

@ -8,9 +8,9 @@ COMPRESSION_FLAGS="-czvf"
mkdir "$REV_NAME" mkdir "$REV_NAME"
cp build/src/citra/citra "$REV_NAME" cp build/bin/citra "$REV_NAME"
cp -r build/src/citra_qt/citra-qt.app "$REV_NAME" cp -r build/bin/citra-qt.app "$REV_NAME"
cp build/src/dedicated_room/citra-room "$REV_NAME" cp build/bin/citra-room "$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}/citra-qt.app" $(brew --prefix)/opt/qt5/bin/macdeployqt "${REV_NAME}/citra-qt.app"

6
CMakeLists.txt
View File

@ -104,6 +104,10 @@ message(STATUS "Target architecture: ${ARCHITECTURE}")
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
# set up output paths for executable binaries
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
if (NOT MSVC) if (NOT MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-attributes")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
@ -126,8 +130,6 @@ else()
# Avoid windows.h from including some usually unused libs like winsocks.h, since this might cause some redefinition errors. # Avoid windows.h from including some usually unused libs like winsocks.h, since this might cause some redefinition errors.
add_definitions(/DWIN32_LEAN_AND_MEAN) add_definitions(/DWIN32_LEAN_AND_MEAN)
# set up output paths for executable binaries (.exe-files, and .dll-files on DLL-capable platforms)
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE) set(CMAKE_CONFIGURATION_TYPES Debug Release CACHE STRING "" FORCE)
# Tweak optimization settings # Tweak optimization settings