From ea649263b752f9b73f1627ef9784ced19fe245bb Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Fri, 28 Apr 2023 13:02:53 -0700 Subject: [PATCH] build: Improvements to bundled libraries support. (#6435) --- .ci/macos/deps.sh | 9 +- .ci/macos/upload.sh | 19 +--- .ci/windows-msvc/build.sh | 1 - CMakeLists.txt | 36 ++++--- CMakeModules/BuildInstaller.cmake | 26 ++--- CMakeModules/BundleLibraries.cmake | 62 ++++++++++++ CMakeModules/DownloadExternals.cmake | 104 +++++++++++++++++--- dist/installer/CMakeLists.txt | 10 +- externals/cmake-modules/FindFFmpeg.cmake | 5 + src/android/app/src/main/jni/CMakeLists.txt | 2 +- src/audio_core/CMakeLists.txt | 2 +- src/citra/CMakeLists.txt | 13 ++- src/citra_qt/CMakeLists.txt | 26 ++++- src/common/CMakeLists.txt | 14 +-- src/core/CMakeLists.txt | 28 +++--- src/dedicated_room/CMakeLists.txt | 2 +- src/input_common/CMakeLists.txt | 2 +- src/network/CMakeLists.txt | 2 +- src/tests/CMakeLists.txt | 2 +- src/video_core/CMakeLists.txt | 2 +- src/web_service/CMakeLists.txt | 2 +- 21 files changed, 255 insertions(+), 114 deletions(-) create mode 100644 CMakeModules/BundleLibraries.cmake diff --git a/.ci/macos/deps.sh b/.ci/macos/deps.sh index cba18ffa7d..946043f5ca 100755 --- a/.ci/macos/deps.sh +++ b/.ci/macos/deps.sh @@ -1,20 +1,13 @@ #!/bin/sh -ex brew install ccache ninja || true -pip3 install macpack -export FFMPEG_VER=5.1 export QT_VER=5.15.8 mkdir tmp cd tmp/ -# install FFMPEG -wget https://github.com/SachinVin/ext-macos-bin/raw/main/ffmpeg/ffmpeg-${FFMPEG_VER}.7z -7z x ffmpeg-${FFMPEG_VER}.7z -cp -rv $(pwd)/ffmpeg-${FFMPEG_VER}/* / - # install Qt -wget https://github.com/SachinVin/ext-macos-bin/raw/main/qt/qt-${QT_VER}.7z +wget https://github.com/citra-emu/ext-macos-bin/raw/main/qt/qt-${QT_VER}.7z 7z x qt-${QT_VER}.7z sudo cp -rv $(pwd)/qt-${QT_VER}/* /usr/local/ diff --git a/.ci/macos/upload.sh b/.ci/macos/upload.sh index 3170673e96..c90c3038f7 100755 --- a/.ci/macos/upload.sh +++ b/.ci/macos/upload.sh @@ -9,25 +9,8 @@ COMPRESSION_FLAGS="-czvf" mkdir "$REV_NAME" cp build/bin/Release/citra "$REV_NAME" +cp -r build/bin/Release/libs "$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" -# move qt frameworks into app bundle for deployment -macdeployqt "${REV_NAME}/citra-qt.app" -executable="${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" - -# move libs into folder for deployment -macpack "${REV_NAME}/citra" -d "libs" - -# workaround for libc++ -install_name_tool -change @loader_path/../Frameworks/libc++.1.0.dylib /usr/lib/libc++.1.dylib "${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt" -install_name_tool -change @loader_path/libs/libc++.1.0.dylib /usr/lib/libc++.1.dylib "${REV_NAME}/citra" - -# Make the launching script executable -chmod +x ${REV_NAME}/citra-qt.app/Contents/MacOS/citra-qt - -# Verify loader instructions -find "$REV_NAME" -type f -exec otool -L {} \; - . .ci/common/post-upload.sh diff --git a/.ci/windows-msvc/build.sh b/.ci/windows-msvc/build.sh index 7daddc269b..fdd7574e36 100644 --- a/.ci/windows-msvc/build.sh +++ b/.ci/windows-msvc/build.sh @@ -6,7 +6,6 @@ cmake .. \ -G Ninja \ -DCMAKE_TOOLCHAIN_FILE="$(pwd)/../CMakeModules/MSVCCache.cmake" \ -DCITRA_USE_CCACHE=ON \ - -DCITRA_USE_BUNDLED_QT=1 \ -DENABLE_QT_TRANSLATION=OFF \ -DCITRA_ENABLE_COMPATIBILITY_REPORTING=${ENABLE_COMPATIBILITY_REPORTING:-"OFF"} \ -DENABLE_COMPATIBILITY_LIST_DOWNLOAD=ON \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 0c19104355..42137b8b51 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,7 +43,7 @@ if (ENABLE_FFMPEG_AUDIO_DECODER OR ENABLE_FFMPEG_VIDEO_DUMPER) set(ENABLE_FFMPEG ON) endif() -CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_FFMPEG "Download bundled FFmpeg binaries" ON "ENABLE_FFMPEG;MSVC" OFF) +CMAKE_DEPENDENT_OPTION(CITRA_USE_BUNDLED_FFMPEG "Download bundled FFmpeg binaries" ON "ENABLE_FFMPEG;MSVC OR APPLE" OFF) option(USE_DISCORD_PRESENCE "Enables Discord Rich Presence" OFF) @@ -57,6 +57,8 @@ option(USE_SYSTEM_BOOST "Use the system Boost libs (instead of the bundled ones) CMAKE_DEPENDENT_OPTION(ENABLE_FDK "Use FDK AAC decoder" OFF "NOT ENABLE_FFMPEG_AUDIO_DECODER;NOT ENABLE_MF" OFF) +CMAKE_DEPENDENT_OPTION(CITRA_BUNDLE_LIBRARIES "Bundle dependent libraries with the output executables" ON "APPLE" OFF) + if (CITRA_USE_PRECOMPILED_HEADERS) if (MSVC AND CCACHE) # buildcache does not properly cache PCH files, leading to compilation errors. @@ -197,31 +199,25 @@ find_package(Threads REQUIRED) if (ENABLE_QT) if (CITRA_USE_BUNDLED_QT) - if (MSVC_VERSION GREATER_EQUAL 1920 AND "x86_64" IN_LIST ARCHITECTURE) - set(QT_VER qt-5.15.7-msvc2019_64) - else() - message(FATAL_ERROR "No bundled Qt binaries for your toolchain. Disable CITRA_USE_BUNDLED_QT and provide your own.") - endif() - - if (DEFINED QT_VER) - download_bundled_external("qt/" ${QT_VER} QT_PREFIX) - endif() - - set(QT_PREFIX_HINT HINTS "${QT_PREFIX}") - else() - # Passing an empty HINTS seems to cause default system paths to get ignored in CMake 2.8 so - # make sure to not pass anything if we don't have one. - set(QT_PREFIX_HINT) + download_qt_external(5.15.2 QT_PREFIX) + list(APPEND CMAKE_PREFIX_PATH ${QT_PREFIX}) endif() - find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia Concurrent ${QT_PREFIX_HINT}) + find_package(Qt5 REQUIRED COMPONENTS Widgets Multimedia Concurrent) if (UNIX AND NOT APPLE) - find_package(Qt5 REQUIRED COMPONENTS DBus ${QT_PREFIX_HINT}) + find_package(Qt5 REQUIRED COMPONENTS DBus) endif() if (ENABLE_QT_TRANSLATION) - find_package(Qt5 REQUIRED COMPONENTS LinguistTools ${QT_PREFIX_HINT}) + find_package(Qt5 REQUIRED COMPONENTS LinguistTools) + endif() + + if (NOT CITRA_USE_BUNDLED_QT) + # Make sure the Qt bin directory is in the prefix path for later consumers. + get_target_property(qmake_executable Qt5::qmake IMPORTED_LOCATION) + get_filename_component(qt_bin_dir "${qmake_executable}" DIRECTORY) + list(APPEND CMAKE_PREFIX_PATH ${qt_bin_dir}) endif() endif() @@ -242,6 +238,8 @@ if (ENABLE_FFMPEG) if (CITRA_USE_BUNDLED_FFMPEG) if ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND "x86_64" IN_LIST ARCHITECTURE) set(FFmpeg_VER "ffmpeg-4.1-win64") + elseif (APPLE) + set(FFmpeg_VER "ffmpeg-6.0") else() message(FATAL_ERROR "No bundled FFmpeg binaries for your toolchain. Disable CITRA_USE_BUNDLED_FFMPEG and provide your own.") endif() diff --git a/CMakeModules/BuildInstaller.cmake b/CMakeModules/BuildInstaller.cmake index f1d65a0fa8..2d86278761 100644 --- a/CMakeModules/BuildInstaller.cmake +++ b/CMakeModules/BuildInstaller.cmake @@ -1,4 +1,4 @@ -# To use this as a script, make sure you pass in the variables SRC_DIR BUILD_DIR and TARGET_FILE +# To use this as a script, make sure you pass in the variables BASE_DIR, SRC_DIR, BUILD_DIR, and TARGET_FILE if(WIN32) set(PLATFORM "windows") @@ -10,29 +10,15 @@ else() message(FATAL_ERROR "Cannot build installer for this unsupported platform") endif() -set(DIST_DIR "${BUILD_DIR}/dist") -set(ARCHIVE "${PLATFORM}.7z") +list(APPEND CMAKE_MODULE_PATH "${BASE_DIR}/CMakeModules") +include(DownloadExternals) +download_qt_external(tools_ifw QT_PREFIX) -file(MAKE_DIRECTORY ${BUILD_DIR}) -file(MAKE_DIRECTORY ${DIST_DIR}) -file(DOWNLOAD https://github.com/citra-emu/ext-windows-bin/raw/master/qtifw/${ARCHIVE} - "${BUILD_DIR}/${ARCHIVE}" SHOW_PROGRESS) -execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${BUILD_DIR}/${ARCHIVE}" - WORKING_DIRECTORY "${BUILD_DIR}/") +file(GLOB_RECURSE INSTALLER_BASE "${QT_PREFIX}/**/installerbase*") +file(GLOB_RECURSE BINARY_CREATOR "${QT_PREFIX}/**/binarycreator*") -set(TARGET_NAME "citra-setup-${PLATFORM}") set(CONFIG_FILE "${SRC_DIR}/config/config_${PLATFORM}.xml") -set(INSTALLER_BASE "${BUILD_DIR}/installerbase_${PLATFORM}") -set(BINARY_CREATOR "${BUILD_DIR}/binarycreator_${PLATFORM}") set(PACKAGES_DIR "${BUILD_DIR}/packages") file(MAKE_DIRECTORY ${PACKAGES_DIR}) -if (UNIX OR APPLE) - execute_process(COMMAND chmod 744 ${BINARY_CREATOR}) -endif() - execute_process(COMMAND ${BINARY_CREATOR} -t ${INSTALLER_BASE} -n -c ${CONFIG_FILE} -p ${PACKAGES_DIR} ${TARGET_FILE}) - -if (APPLE) - execute_process(COMMAND chmod 744 ${TARGET_FILE}.app/Contents/MacOS/${TARGET_NAME}) -endif() diff --git a/CMakeModules/BundleLibraries.cmake b/CMakeModules/BundleLibraries.cmake new file mode 100644 index 0000000000..aa407e12cf --- /dev/null +++ b/CMakeModules/BundleLibraries.cmake @@ -0,0 +1,62 @@ +# Bundles libraries with an output executable. +# Parameters: +# - TYPE: "qt" or "standalone". The type of app to bundle. +# - "qt" uses windeployqt/macdeployqt to bundle Qt and other libraries. +# - "standalone" copies dependent libraries to a "libs" folder alongside the executable file. +# - EXECUTABLE_PATH: Path to the executable binary. + +# TODO: This does not really work fully for Windows yet, some libraries are missing from the output. +# TODO: Leaving a basic framework of Windows support here to be iterated on in the future. +if (WIN32) + message(FATAL_ERROR "Advanced library bundling is not yet supported for Windows.") +endif() + +if ("${TYPE}" STREQUAL "qt") + get_filename_component(executable_dir ${EXECUTABLE_PATH} DIRECTORY) + + # Bundle dependencies using appropriate Qt tool. + if (WIN32) + find_program(WINDEPLOYQT_EXECUTABLE windeployqt) + execute_process(COMMAND ${WINDEPLOYQT_EXECUTABLE} ${EXECUTABLE_PATH} + --no-compiler-runtime --no-system-d3d-compiler --no-opengl-sw --no-translations + --plugindir "${executable_dir}/plugins") + elseif (APPLE) + get_filename_component(contents_dir ${executable_dir} DIRECTORY) + get_filename_component(bundle_dir ${contents_dir} DIRECTORY) + + find_program(MACDEPLOYQT_EXECUTABLE macdeployqt) + execute_process(COMMAND ${MACDEPLOYQT_EXECUTABLE} ${bundle_dir} -executable=${EXECUTABLE_PATH} -always-overwrite) + else() + message(FATAL_ERROR "Unsupported OS for Qt-based library bundling.") + endif() +else() + # Resolve dependent library files. + file(GET_RUNTIME_DEPENDENCIES + EXECUTABLES ${EXECUTABLE_PATH} + RESOLVED_DEPENDENCIES_VAR resolved_deps + UNRESOLVED_DEPENDENCIES_VAR unresolved_deps + POST_EXCLUDE_REGEXES ".*system32/.*\\.dll") + + # Determine libraries directory. + get_filename_component(executable_dir ${EXECUTABLE_PATH} DIRECTORY) + if (WIN32) + # Same directory since we don't have rpath. + set(lib_dir ${executable_dir}) + else() + set(lib_dir ${executable_dir}/libs) + endif() + + # Copy library files to bundled output. + file(MAKE_DIRECTORY ${lib_dir}) + foreach (lib_file ${resolved_deps}) + # Use native copy to turn symlinks into normal files. + execute_process(COMMAND cp -L ${lib_file} ${lib_dir}) + endforeach() + + # Add libs directory to executable rpath where applicable. + if (APPLE) + execute_process(COMMAND install_name_tool -add_rpath "@loader_path/libs" ${EXECUTABLE_PATH}) + elseif (UNIX) + execute_process(COMMAND patchelf --set-rpath '$ORIGIN/../libs' ${EXECUTABLE_PATH}) + endif() +endif() diff --git a/CMakeModules/DownloadExternals.cmake b/CMakeModules/DownloadExternals.cmake index 138a15d5a0..bc6edc5816 100644 --- a/CMakeModules/DownloadExternals.cmake +++ b/CMakeModules/DownloadExternals.cmake @@ -4,15 +4,95 @@ # remote_path: path to the file to download, relative to the remote repository root # prefix_var: name of a variable which will be set with the path to the extracted contents function(download_bundled_external remote_path lib_name prefix_var) -set(prefix "${CMAKE_BINARY_DIR}/externals/${lib_name}") -if (NOT EXISTS "${prefix}") - message(STATUS "Downloading binaries for ${lib_name}...") - file(DOWNLOAD - https://github.com/citra-emu/ext-windows-bin/raw/master/${remote_path}${lib_name}.7z - "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" SHOW_PROGRESS) - execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" - WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals") -endif() -message(STATUS "Using bundled binaries at ${prefix}") -set(${prefix_var} "${prefix}" PARENT_SCOPE) -endfunction() \ No newline at end of file + get_external_prefix(${lib_name} prefix) + if (NOT EXISTS "${prefix}") + message(STATUS "Downloading binaries for ${lib_name}...") + + if (WIN32) + set(repo_base "ext-windows-bin/raw/master") + elseif (APPLE) + set(repo_base "ext-macos-bin/raw/main") + else() + message(FATAL_ERROR "Bundled libraries are unsupported for this OS.") + endif() + + file(DOWNLOAD + https://github.com/citra-emu/${repo_base}/${remote_path}${lib_name}.7z + "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" SHOW_PROGRESS) + execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_BINARY_DIR}/externals/${lib_name}.7z" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/externals") + endif() + + # For packages that include the /usr/local prefix, include it in the prefix path. + if (EXISTS "${prefix}/usr/local") + set(prefix "${prefix}/usr/local") + endif() + + message(STATUS "Using bundled binaries at ${prefix}") + set(${prefix_var} "${prefix}" PARENT_SCOPE) +endfunction() + +# This function downloads Qt using aqt. +# Params: +# target: Qt dependency to install. Specify a version number to download Qt, or "tools_(name)" for a specific build tool. +# prefix_var: Name of a variable which will be set with the path to the extracted contents. +function(download_qt_external target prefix_var) + # Determine installation parameters for OS, architecture, and compiler + if (WIN32) + set(host "windows") + if (MINGW) + set(arch_path "mingw81") + elseif ((MSVC_VERSION GREATER_EQUAL 1920 AND MSVC_VERSION LESS 1940) AND "x86_64" IN_LIST ARCHITECTURE) + if ("arm64" IN_LIST ARCHITECTURE) + set(arch_path "msvc2019_arm64") + elseif ("x86_64" IN_LIST ARCHITECTURE) + set(arch_path "msvc2019_64") + else() + message(FATAL_ERROR "Unsupported bundled Qt architecture. Disable CITRA_USE_BUNDLED_QT and provide your own.") + endif() + else() + message(FATAL_ERROR "Unsupported bundled Qt toolchain. Disable CITRA_USE_BUNDLED_QT and provide your own.") + endif() + set(arch "win64_${arch_path}") + elseif (APPLE) + set(host "mac") + set(arch "clang_64") + set(arch_path "macos") + else() + set(host "linux") + set(arch "gcc_64") + set(arch_path "linux") + endif() + + get_external_prefix(qt base_path) + if (target MATCHES "tools_.*") + set(prefix "${base_path}") + set(install_args install-tool --outputdir ${base_path} ${host} desktop ${target}) + else() + set(prefix "${base_path}/${target}/${arch_path}") + set(install_args install-qt --outputdir ${base_path} ${host} desktop ${target} ${arch}) + endif() + + if (NOT EXISTS "${prefix}") + message(STATUS "Downloading binaries for Qt...") + if (WIN32) + set(aqt_path "${CMAKE_BINARY_DIR}/externals/aqt.exe") + file(DOWNLOAD + https://github.com/miurahr/aqtinstall/releases/download/v3.1.4/aqt.exe + ${aqt_path} SHOW_PROGRESS) + execute_process(COMMAND ${aqt_path} ${install_args}) + else() + # aqt does not offer binary releases for other platforms, so download and run from pip. + set(aqt_install_path "${CMAKE_BINARY_DIR}/externals/aqt") + execute_process(COMMAND python3 -m pip install --target=${aqt_install_path} aqtinstall) + execute_process(COMMAND ${CMAKE_COMMAND} -E env PYTHONPATH=${aqt_install_path} python3 -m aqt ${install_args}) + endif() + endif() + + message(STATUS "Using downloaded Qt binaries at ${prefix}") + set(${prefix_var} "${prefix}" PARENT_SCOPE) +endfunction() + +function(get_external_prefix lib_name prefix_var) + set(${prefix_var} "${CMAKE_BINARY_DIR}/externals/${lib_name}" PARENT_SCOPE) +endfunction() diff --git a/dist/installer/CMakeLists.txt b/dist/installer/CMakeLists.txt index 4fbebaf13e..05f39edb02 100644 --- a/dist/installer/CMakeLists.txt +++ b/dist/installer/CMakeLists.txt @@ -5,18 +5,24 @@ elseif(APPLE) set(PLATFORM "mac") elseif(UNIX) set(PLATFORM "linux") +else() + message(FATAL_ERROR "Cannot build installer for this unsupported platform") endif() set(BUILD_DIR "${CMAKE_BINARY_DIR}/installer") set(DIST_DIR "${BUILD_DIR}/dist") set(TARGET_FILE "${DIST_DIR}/citra-setup-${PLATFORM}") -file(MAKE_DIRECTORY ${BUILD_DIR}) # Adds a custom target that will run the BuildInstaller.cmake file # CMake can't just run a cmake function as a custom command, so this is a way around it. # Calls the cmake command and runs a cmake file in "scripting" mode passing in variables with -D add_custom_command(OUTPUT "${TARGET_FILE}" - COMMAND ${CMAKE_COMMAND} -DSRC_DIR=${CMAKE_CURRENT_SOURCE_DIR} -D BUILD_DIR=${BUILD_DIR} -D TARGET_FILE=${TARGET_FILE} -P ${CMAKE_SOURCE_DIR}/CMakeModules/BuildInstaller.cmake + COMMAND ${CMAKE_COMMAND} + -DBASE_DIR=${CMAKE_SOURCE_DIR} + -DSRC_DIR=${CMAKE_CURRENT_SOURCE_DIR} + -DBUILD_DIR=${BUILD_DIR} + -DTARGET_FILE=${TARGET_FILE} + -P ${CMAKE_SOURCE_DIR}/CMakeModules/BuildInstaller.cmake WORKING_DIRECTORY ${BUILD_DIR} ) diff --git a/externals/cmake-modules/FindFFmpeg.cmake b/externals/cmake-modules/FindFFmpeg.cmake index cac21c614f..5a1a6c4b88 100644 --- a/externals/cmake-modules/FindFFmpeg.cmake +++ b/externals/cmake-modules/FindFFmpeg.cmake @@ -152,6 +152,11 @@ foreach(c ${_FFmpeg_ALL_COMPONENTS}) IMPORTED_LOCATION ${FFmpeg_LIBRARY_${c}} INTERFACE_INCLUDE_DIRECTORIES ${FFmpeg_INCLUDE_${c}} ) + if(APPLE) + set_target_properties(FFmpeg::${c} PROPERTIES + MACOSX_RPATH 1 + ) + endif() if(_FFmpeg_DEPS_${c}) set(deps) foreach(dep ${_FFmpeg_DEPS_${c}}) diff --git a/src/android/app/src/main/jni/CMakeLists.txt b/src/android/app/src/main/jni/CMakeLists.txt index 6cc0cf9061..c78047ab8b 100644 --- a/src/android/app/src/main/jni/CMakeLists.txt +++ b/src/android/app/src/main/jni/CMakeLists.txt @@ -33,7 +33,7 @@ add_library(citra-android SHARED ndk_motion.h ) -target_link_libraries(citra-android PRIVATE audio_core common core input_common network) +target_link_libraries(citra-android PRIVATE audio_core citra_common citra_core input_common network) target_link_libraries(citra-android PRIVATE android camera2ndk EGL glad inih jnigraphics log mediandk yuv) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} citra-android) diff --git a/src/audio_core/CMakeLists.txt b/src/audio_core/CMakeLists.txt index 2599f82ad1..d96a1facea 100644 --- a/src/audio_core/CMakeLists.txt +++ b/src/audio_core/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(audio_core STATIC create_target_directory_groups(audio_core) -target_link_libraries(audio_core PUBLIC common) +target_link_libraries(audio_core PUBLIC citra_common) target_link_libraries(audio_core PRIVATE SoundTouch teakra) set_target_properties(audio_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) add_definitions(-DSOUNDTOUCH_INTEGER_SAMPLES) diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt index 650ba31629..8b1b59bb99 100644 --- a/src/citra/CMakeLists.txt +++ b/src/citra/CMakeLists.txt @@ -18,7 +18,7 @@ add_executable(citra create_target_directory_groups(citra) -target_link_libraries(citra PRIVATE common core input_common network) +target_link_libraries(citra PRIVATE citra_common citra_core input_common network) target_link_libraries(citra PRIVATE inih glad) if (MSVC) target_link_libraries(citra PRIVATE getopt) @@ -41,3 +41,14 @@ endif() if (CITRA_USE_PRECOMPILED_HEADERS) target_precompile_headers(citra PRIVATE precompiled_headers.h) endif() + +if (CITRA_BUNDLE_LIBRARIES) + add_custom_command(TARGET citra + POST_BUILD + COMMAND ${CMAKE_COMMAND} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} + -DTYPE=standalone + -DEXECUTABLE_PATH=$ + -P ${CMAKE_SOURCE_DIR}/CMakeModules/BundleLibraries.cmake + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index ed4af583a6..dc043dc2f3 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -246,13 +246,15 @@ target_sources(citra-qt if (APPLE) set(MACOSX_ICON "../../dist/citra.icns") set_source_files_properties(${MACOSX_ICON} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) - target_sources(citra-qt PRIVATE ${MACOSX_ICON}) - set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE TRUE) - set_target_properties(citra-qt PROPERTIES MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist) target_sources(citra-qt PRIVATE + ${MACOSX_ICON} macos_authorization.h macos_authorization.mm ) + set_target_properties(citra-qt PROPERTIES + MACOSX_BUNDLE TRUE + MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_SOURCE_DIR}/Info.plist + ) elseif(WIN32) # compile as a win32 gui application instead of a console application target_link_libraries(citra-qt PRIVATE Qt5::WinMain) @@ -263,9 +265,25 @@ elseif(WIN32) endif() endif() +if (CITRA_BUNDLE_LIBRARIES) + if (APPLE) + set(BUNDLE_DIR "$") + endif() + + add_custom_command(TARGET citra-qt + POST_BUILD + COMMAND ${CMAKE_COMMAND} + -DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH} + -DTYPE=qt + -DEXECUTABLE_PATH=$ + -DBUNDLE_PATH=${BUNDLE_DIR} + -P ${CMAKE_SOURCE_DIR}/CMakeModules/BundleLibraries.cmake + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) +endif() + create_target_directory_groups(citra-qt) -target_link_libraries(citra-qt PRIVATE audio_core common core input_common network video_core) +target_link_libraries(citra-qt PRIVATE audio_core citra_common citra_core input_common network video_core) target_link_libraries(citra-qt PRIVATE Boost::boost glad nihstro-headers Qt5::Widgets Qt5::Multimedia Qt5::Concurrent) target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index 767f68d5ad..4c9d9500f3 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -42,7 +42,7 @@ add_custom_command(OUTPUT scm_rev.cpp "${CMAKE_SOURCE_DIR}/CMakeModules/GenerateSCMRev.cmake" ) -add_library(common STATIC +add_library(citra_common STATIC aarch64/cpu_detect.cpp aarch64/cpu_detect.h alignment.h @@ -131,16 +131,16 @@ add_library(common STATIC zstd_compression.h ) -create_target_directory_groups(common) +create_target_directory_groups(citra_common) -target_link_libraries(common PUBLIC fmt::fmt microprofile Boost::boost Boost::serialization Boost::iostreams) -target_link_libraries(common PRIVATE libzstd_static) -set_target_properties(common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) +target_link_libraries(citra_common PUBLIC fmt::fmt microprofile Boost::boost Boost::serialization Boost::iostreams) +target_link_libraries(citra_common PRIVATE libzstd_static) +set_target_properties(citra_common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) if ("x86_64" IN_LIST ARCHITECTURE) - target_link_libraries(common PRIVATE xbyak) + target_link_libraries(citra_common PRIVATE xbyak) endif() if (CITRA_USE_PRECOMPILED_HEADERS) - target_precompile_headers(common PRIVATE precompiled_headers.h) + target_precompile_headers(citra_common PRIVATE precompiled_headers.h) endif() diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 4bf11d14d9..14e8862157 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,4 +1,4 @@ -add_library(core STATIC +add_library(citra_core STATIC 3ds.h arm/arm_interface.h arm/dyncom/arm_dyncom.cpp @@ -471,29 +471,29 @@ add_library(core STATIC ) if (ENABLE_FFMPEG_VIDEO_DUMPER) - target_sources(core PRIVATE + target_sources(citra_core PRIVATE dumping/ffmpeg_backend.cpp dumping/ffmpeg_backend.h ) endif() -create_target_directory_groups(core) +create_target_directory_groups(citra_core) -target_link_libraries(core PUBLIC common PRIVATE audio_core network video_core) -target_link_libraries(core PRIVATE Boost::boost Boost::serialization Boost::iostreams) -target_link_libraries(core PUBLIC dds-ktx PRIVATE cryptopp fmt::fmt lodepng open_source_archives) -set_target_properties(core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) +target_link_libraries(citra_core PUBLIC citra_common PRIVATE audio_core network video_core) +target_link_libraries(citra_core PRIVATE Boost::boost Boost::serialization Boost::iostreams) +target_link_libraries(citra_core PUBLIC dds-ktx PRIVATE cryptopp fmt::fmt lodepng open_source_archives) +set_target_properties(citra_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) if (ENABLE_WEB_SERVICE) - target_compile_definitions(core PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT) - target_link_libraries(core PRIVATE web_service ${OPENSSL_LIBS} httplib) + target_compile_definitions(citra_core PRIVATE -DENABLE_WEB_SERVICE -DCPPHTTPLIB_OPENSSL_SUPPORT) + target_link_libraries(citra_core PRIVATE web_service ${OPENSSL_LIBS} httplib) if (ANDROID) - target_link_libraries(core PRIVATE ifaddrs) + target_link_libraries(citra_core PRIVATE ifaddrs) endif() endif() if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE) - target_sources(core PRIVATE + target_sources(citra_core PRIVATE arm/dynarmic/arm_dynarmic.cpp arm/dynarmic/arm_dynarmic.h arm/dynarmic/arm_dynarmic_cp15.cpp @@ -503,13 +503,13 @@ if ("x86_64" IN_LIST ARCHITECTURE OR "arm64" IN_LIST ARCHITECTURE) arm/dynarmic/arm_tick_counts.cpp arm/dynarmic/arm_tick_counts.h ) - target_link_libraries(core PRIVATE dynarmic) + target_link_libraries(citra_core PRIVATE dynarmic) endif() if (ENABLE_FFMPEG_VIDEO_DUMPER) - target_link_libraries(core PUBLIC FFmpeg::avcodec FFmpeg::avformat FFmpeg::swscale FFmpeg::swresample FFmpeg::avutil) + target_link_libraries(citra_core PUBLIC FFmpeg::avcodec FFmpeg::avformat FFmpeg::swscale FFmpeg::swresample FFmpeg::avutil) endif() if (CITRA_USE_PRECOMPILED_HEADERS) - target_precompile_headers(core PRIVATE precompiled_headers.h) + target_precompile_headers(citra_core PRIVATE precompiled_headers.h) endif() diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txt index ec2dc5ffde..e319f5f87d 100644 --- a/src/dedicated_room/CMakeLists.txt +++ b/src/dedicated_room/CMakeLists.txt @@ -8,7 +8,7 @@ add_executable(citra-room create_target_directory_groups(citra-room) -target_link_libraries(citra-room PRIVATE common network) +target_link_libraries(citra-room PRIVATE citra_common network) if (ENABLE_WEB_SERVICE) target_compile_definitions(citra-room PRIVATE -DENABLE_WEB_SERVICE) target_link_libraries(citra-room PRIVATE web_service) diff --git a/src/input_common/CMakeLists.txt b/src/input_common/CMakeLists.txt index 246e2652bd..e1221530f8 100644 --- a/src/input_common/CMakeLists.txt +++ b/src/input_common/CMakeLists.txt @@ -42,7 +42,7 @@ if(ENABLE_LIBUSB) endif() create_target_directory_groups(input_common) -target_link_libraries(input_common PUBLIC core PRIVATE common ${Boost_LIBRARIES}) +target_link_libraries(input_common PUBLIC citra_core PRIVATE citra_common ${Boost_LIBRARIES}) set_target_properties(input_common PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) if (CITRA_USE_PRECOMPILED_HEADERS) diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 7ffd95368e..18dc7e6324 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -26,7 +26,7 @@ if (ENABLE_WEB_SERVICE) endif() endif() -target_link_libraries(network PRIVATE common enet Boost::serialization) +target_link_libraries(network PRIVATE citra_common enet Boost::serialization) set_target_properties(network PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) if (CITRA_USE_PRECOMPILED_HEADERS) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index 5158d13486..a7597f44fe 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -17,7 +17,7 @@ add_executable(tests create_target_directory_groups(tests) -target_link_libraries(tests PRIVATE common core video_core audio_core) +target_link_libraries(tests PRIVATE citra_common citra_core video_core audio_core) target_link_libraries(tests PRIVATE ${PLATFORM_LIBRARIES} Catch2::Catch2WithMain nihstro-headers Threads::Threads) add_test(NAME tests COMMAND tests) diff --git a/src/video_core/CMakeLists.txt b/src/video_core/CMakeLists.txt index d249f96de5..154fe02e23 100644 --- a/src/video_core/CMakeLists.txt +++ b/src/video_core/CMakeLists.txt @@ -125,7 +125,7 @@ target_include_directories(video_core PRIVATE ${HOST_SHADERS_INCLUDE}) create_target_directory_groups(video_core) -target_link_libraries(video_core PUBLIC common core) +target_link_libraries(video_core PUBLIC citra_common citra_core) target_link_libraries(video_core PRIVATE glad json-headers dds-ktx nihstro-headers Boost::serialization) set_target_properties(video_core PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt index 9082a01188..d030236042 100644 --- a/src/web_service/CMakeLists.txt +++ b/src/web_service/CMakeLists.txt @@ -17,7 +17,7 @@ add_library(web_service STATIC create_target_directory_groups(web_service) target_compile_definitions(web_service PRIVATE -DCPPHTTPLIB_OPENSSL_SUPPORT) -target_link_libraries(web_service PRIVATE common network json-headers httplib cpp-jwt) +target_link_libraries(web_service PRIVATE citra_common network json-headers httplib cpp-jwt) target_link_libraries(web_service PUBLIC ${OPENSSL_LIBS}) set_target_properties(web_service PROPERTIES INTERPROCEDURAL_OPTIMIZATION ${ENABLE_LTO}) if (ANDROID)