VERY experimental Nintendo Switch 2 emulator
C++
[cmake] fix yuzu_cmd, bundled overrides (#381)
crueter2bc792e211a1
diff --git a/CMakeModules/CPMUtil.cmake b/CMakeModules/CPMUtil.cmakeindex 4d7db6ed61..9daada47ad 100644--- a/CMakeModules/CPMUtil.cmake+++ b/CMakeModules/CPMUtil.cmake@@ -184,8 +184,6 @@ function(AddJsonPackage)# system/bundledif (bundled STREQUAL "unset" AND DEFINED JSON_BUNDLED_PACKAGE)set(bundled ${JSON_BUNDLED_PACKAGE})- else()- set(bundled ON)endif()AddPackage(@@ -259,6 +257,7 @@ function(AddPackage)KEYBUNDLED_PACKAGE+ FIND_PACKAGE_ARGUMENTS)set(multiValueArgs OPTIONS PATCHES)@@ -409,9 +408,9 @@ function(AddPackage)set_precedence(OFF OFF)elseif (CPMUTIL_FORCE_SYSTEM)set_precedence(ON ON)- elseif(NOT CPMUTIL_FORCE_BUNDLED)+ elseif(CPMUTIL_FORCE_BUNDLED)set_precedence(OFF OFF)- elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE)+ elseif (DEFINED PKG_ARGS_BUNDLED_PACKAGE AND NOT PKG_ARGS_BUNDLED_PACKAGE STREQUAL "unset")if (PKG_ARGS_BUNDLED_PACKAGE)set(local OFF)else()diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.ktsindex d907284bb7..e91d2e8c52 100644--- a/src/android/app/build.gradle.kts+++ b/src/android/app/build.gradle.kts@@ -173,6 +173,7 @@ android {"-DENABLE_OPENSSL=ON","-DANDROID_ARM_NEON=true", // cryptopp requires Neon to work"-DYUZU_USE_CPM=ON",+ "-DCPMUTIL_FORCE_BUNDLED=ON","-DYUZU_USE_BUNDLED_FFMPEG=ON","-DYUZU_ENABLE_LTO=ON","-DCMAKE_EXPORT_COMPILE_COMMANDS=ON",diff --git a/src/yuzu_cmd/CMakeLists.txt b/src/yuzu_cmd/CMakeLists.txtindex ebd8fd7387..a7cf6d204c 100644--- a/src/yuzu_cmd/CMakeLists.txt+++ b/src/yuzu_cmd/CMakeLists.txt@@ -39,6 +39,7 @@ create_resource("../../dist/yuzu.bmp" "yuzu_cmd/yuzu_icon.h" "yuzu_icon")target_include_directories(yuzu-cmd PRIVATE ${RESOURCES_DIR})target_link_libraries(yuzu-cmd PRIVATE SDL2::SDL2 Vulkan::Headers)+target_link_libraries(yuzu-cmd PRIVATE GPUOpen::VulkanMemoryAllocator)if(UNIX AND NOT APPLE)install(TARGETS yuzu-cmd)