aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorcrueter <crueter@eden-emu.dev>2025-11-16 04:59:30 +0100
committercrueter <crueter@eden-emu.dev>2025-11-16 04:59:30 +0100
commitb6908131969b3977e071d6737f2a102a0354224d (patch)
tree496d5ac93482c355979e3f3b00512ab6d7a32ebb /src
parentb9f54f49790d1c115a85b40806ceef7b5b5a21bc (diff)
[externals] FFmpeg -> v8.0-be99d2c0b2, OpenSSL -> v3.6.0-e3608d80df, SDL2 -> 2.32.10-38e0094637 (#3003)
FFmpeg: - builds for FreeBSD, OpenBSD, Solaris - minsizerel - Proper system lib linking on MinGW - removed shared stuff entirely outside of android because their build system SUCKS OpenSSL: - macOS universal - Proper system lib linking on MinGW SDL2: - macOS universal Both are now based on branches/commits rather than tags (since their respective release branches have a ton of new stuff lol) Signed-off-by: crueter <crueter@eden-emu.dev> Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3003 Reviewed-by: Lizzie <lizzie@eden-emu.dev> Reviewed-by: CamilleLaVey <camillelavey99@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/frontend_common/CMakeLists.txt2
-rw-r--r--src/qt_common/CMakeLists.txt4
-rw-r--r--src/yuzu/CMakeLists.txt24
3 files changed, 5 insertions, 25 deletions
diff --git a/src/frontend_common/CMakeLists.txt b/src/frontend_common/CMakeLists.txt
index 1d15443008..911f3ebdca 100644
--- a/src/frontend_common/CMakeLists.txt
+++ b/src/frontend_common/CMakeLists.txt
@@ -25,7 +25,7 @@ if (ENABLE_UPDATE_CHECKER)
if (ENABLE_OPENSSL)
target_compile_definitions(frontend_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
- target_link_libraries(frontend_common PRIVATE OpenSSL::SSL)
+ target_link_libraries(frontend_common PRIVATE OpenSSL::SSL OpenSSL::Crypto)
endif()
endif()
diff --git a/src/qt_common/CMakeLists.txt b/src/qt_common/CMakeLists.txt
index 895320703a..2100760d9c 100644
--- a/src/qt_common/CMakeLists.txt
+++ b/src/qt_common/CMakeLists.txt
@@ -42,10 +42,12 @@ if (USE_DISCORD_PRESENCE)
discord/discord_impl.h
)
target_link_libraries(qt_common PUBLIC DiscordRPC::discord-rpc httplib::httplib)
+
if (YUZU_USE_BUNDLED_OPENSSL)
- target_link_libraries(qt_common PUBLIC OpenSSL::SSL)
+ target_link_libraries(qt_common PUBLIC OpenSSL::SSL OpenSSL::Crypto)
target_compile_definitions(qt_common PRIVATE CPPHTTPLIB_OPENSSL_SUPPORT)
endif()
+
target_compile_definitions(qt_common PUBLIC USE_DISCORD_PRESENCE)
endif()
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index d0f2121a65..e69dfd52aa 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -459,30 +459,8 @@ if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD))
-Wno-missing-field-initializers)
endif()
-## certain libraries need extra static libs to be linked ##
-# I have no fucking clue why it ONLY has to be on yuzu
-# yuzu_cmd works totally fine but not this??????????
if (YUZU_STATIC_BUILD AND MINGW)
- macro(extra_libs)
- foreach(lib ${ARGN})
- find_library(${lib}_LIBRARY ${lib} REQUIRED)
- target_link_libraries(yuzu PRIVATE ${${lib}_LIBRARY})
- endforeach()
- endmacro()
-
- # I am constantly impressed at how ridiculously stupid the linker is
- # NB: yes, we have to put them here twice. I have no idea why
-
- # libtiff.a
- extra_libs(tiff jbig bz2 lzma deflate jpeg tiff)
-
- # libfreetype.a
- extra_libs(freetype bz2 Lerc brotlidec brotlicommon freetype)
-
- # libharfbuzz.a
- extra_libs(harfbuzz graphite2)
-
- extra_libs(wsock32 ws2_32 crypt32 mswsock wlanapi)
+ static_qt_link(yuzu)
endif()
create_target_directory_groups(yuzu)