VERY experimental Nintendo Switch 2 emulator
C++
[cmake] fix macos mbedtls (#3109)
crueter318998cbb559
diff --git a/CMakeLists.txt b/CMakeLists.txtindex 0d385b9436..4afbc13683 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -128,9 +128,6 @@ if (YUZU_STATIC_BUILD)## find .a libs first (static, usually)set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")- ## some libraries define a Library::Name_static alternative ##- set(YUZU_STATIC_SUFFIX _static)-## some libraries use CMAKE_IMPORT_LIBRARY_SUFFIX e.g. Harfbuzz ##set(CMAKE_IMPORT_LIBRARY_SUFFIX ".a")@@ -161,20 +158,22 @@ if (YUZU_STATIC_BUILD)set(YUZU_USE_BUNDLED_OPENSSL ON)set(HTTPLIB_USE_BROTLI_IF_AVAILABLE OFF)++ ## some libraries define a Library::Name_static alternative ##+ set(MBEDTLS_LIB_SUFFIX _static)elseif(APPLE)- # these libs do not properly provide static libs/let you do it with cmakeset(YUZU_USE_CPM ON)set(YUZU_USE_BUNDLED_FFMPEG ON)set(YUZU_USE_BUNDLED_SDL2 ON)set(YUZU_USE_BUNDLED_OPENSSL ON)- # IMPORTED_IMPLIB not set for imported target- # TODO(crueter): wtf+ # these libs do not properly provide static libs/let you do it with cmakeset(fmt_FORCE_BUNDLED ON)set(SPIRV-Tools_FORCE_BUNDLED ON)set(SPIRV-Headers_FORCE_BUNDLED ON)set(zstd_FORCE_BUNDLED ON)+ set(MbedTLS_FORCE_BUNDLED ON)endif()endif()diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txtindex d1bbf37eb9..6a8b9b93b3 100644--- a/src/core/CMakeLists.txt+++ b/src/core/CMakeLists.txt@@ -1203,7 +1203,7 @@ else()target_link_libraries(core PUBLIC Boost::headers)endif()-target_link_libraries(core PRIVATE fmt::fmt nlohmann_json::nlohmann_json RenderDoc::API MbedTLS::mbedcrypto${YUZU_STATIC_SUFFIX} MbedTLS::mbedtls${YUZU_STATIC_SUFFIX})+target_link_libraries(core PRIVATE fmt::fmt nlohmann_json::nlohmann_json RenderDoc::API MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX} MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX})# if (MINGW)# target_link_libraries(core PRIVATE ws2_32 mswsock wlanapi)# endif()diff --git a/src/dedicated_room/CMakeLists.txt b/src/dedicated_room/CMakeLists.txtindex e74168a5d5..eb0b4f399e 100644--- a/src/dedicated_room/CMakeLists.txt+++ b/src/dedicated_room/CMakeLists.txt@@ -16,7 +16,7 @@ if (ENABLE_WEB_SERVICE)target_link_libraries(yuzu-room PRIVATE web_service)endif()-target_link_libraries(yuzu-room PRIVATE MbedTLS::mbedcrypto${YUZU_STATIC_SUFFIX} MbedTLS::mbedtls${YUZU_STATIC_SUFFIX})+target_link_libraries(yuzu-room PRIVATE MbedTLS::mbedcrypto${MBEDTLS_LIB_SUFFIX} MbedTLS::mbedtls${MBEDTLS_LIB_SUFFIX})if (MSVC)target_link_libraries(yuzu-room PRIVATE getopt)endif()