VERY experimental Nintendo Switch 2 emulator
C++
vcpkg,cmake: Use vcpkg for dbghelp
lat9nq72617ceb01de
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 2ab0ea589d..20dd1383f5 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -38,6 +38,8 @@ option(YUZU_USE_BUNDLED_OPUS "Compile bundled opus" ON)option(YUZU_TESTS "Compile tests" ON)+CMAKE_DEPENDENT_OPTION(YUZU_CRASH_DUMPS "Compile Windows crash dump (Minidump) support" OFF "WIN32" OFF)+option(YUZU_USE_BUNDLED_VCPKG "Use vcpkg for yuzu dependencies" "${MSVC}")option(YUZU_CHECK_SUBMODULES "Check if submodules are present" ON)@@ -46,6 +48,9 @@ if (YUZU_USE_BUNDLED_VCPKG)if (YUZU_TESTS)list(APPEND VCPKG_MANIFEST_FEATURES "yuzu-tests")endif()+ if (YUZU_CRASH_DUMPS)+ list(APPEND VCPKG_MANIFEST_FEATURES "dbghelp")+ endif()include(${CMAKE_SOURCE_DIR}/externals/vcpkg/scripts/buildsystems/vcpkg.cmake)elseif(NOT "$ENV{VCPKG_TOOLCHAIN_FILE}" STREQUAL "")@@ -447,6 +452,13 @@ elseif (WIN32)# PSAPI is the Process Status APIset(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} psapi imm32 version)endif()++ if (YUZU_CRASH_DUMPS)+ find_library(DBGHELP_LIBRARY dbghelp)+ if ("${DBGHELP_LIBRARY}" STREQUAL "DBGHELP_LIBRARY-NOTFOUND")+ message(FATAL_ERROR "YUZU_CRASH_DUMPS enabled but dbghelp library not found")+ endif()+ endif()elseif (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU|SunOS)$")set(PLATFORM_LIBRARIES rt)endif()diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txtindex 3d9906ade1..df0f64b830 100644--- a/src/yuzu/CMakeLists.txt+++ b/src/yuzu/CMakeLists.txt@@ -208,7 +208,7 @@ add_executable(yuzuyuzu.rc)-if (WIN32 AND NOT ("${DBGHELP_LIBRARY}" STREQUAL "DBGHELP_LIBRARY-NOTFOUND"))+if (WIN32 AND YUZU_CRASH_DUMPS)target_sources(yuzu PRIVATEmini_dump.cppmini_dump.hdiff --git a/vcpkg.json b/vcpkg.jsonindex c4413e22ad..3c92510d60 100644--- a/vcpkg.json+++ b/vcpkg.json@@ -31,6 +31,10 @@"yuzu-tests": {"description": "Compile tests","dependencies": [ "catch2" ]+ },+ "dbghelp": {+ "description": "Compile Windows crash dump (Minidump) support",+ "dependencies": [ "dbghelp" ]}},"overrides": [