diff options
| author | crueter <crueter@eden-emu.dev> | 2026-01-20 18:31:28 +0100 |
|---|---|---|
| committer | crueter <crueter@eden-emu.dev> | 2026-01-20 18:31:28 +0100 |
| commit | f61f0a28c66d48ba8219053f44c22b92c8edce24 (patch) | |
| tree | 16df8c65d0836aefc19e9db4897a64cbbfc6eb9d /src | |
| parent | cb26ea154c9eedc5fd8dae33a39cd86ca1d927ab (diff) | |
[cmake] Fix MinGW/arm64 build/runtime errors (#3352)
Mostly just jpeg being weird. Also, due to the way I've built it, we
don't need all those system libs anymore because they are bundled into
the Qt build.
Signed-off-by: crueter <crueter@eden-emu.dev>
Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/3352
Reviewed-by: DraVee <dravee@eden-emu.dev>
Reviewed-by: Lizzie <lizzie@eden-emu.dev>
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | src/yuzu/CMakeLists.txt | 14 |
2 files changed, 9 insertions, 16 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d8d9e10c9f..6cafe4882a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-FileCopyrightText: 2018 yuzu Emulator Project # SPDX-License-Identifier: GPL-2.0-or-later @@ -175,11 +175,10 @@ else() if (YUZU_STATIC_BUILD AND NOT APPLE) add_compile_options(-static) - if (YUZU_STATIC_BUILD) - # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static - add_link_options(-static -lpthread) - add_link_options(-static-libgcc -static-libstdc++) - endif() + + # yuzu-cmd requires us to explicitly link libpthread, libgcc, and libstdc++ as static + add_link_options(-Wl,-Bstatic -static -lpthread) + add_link_options(-static-libgcc -static-libstdc++) endif() if (MINGW) diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt index 87d4652b07..35c6f80e40 100644 --- a/src/yuzu/CMakeLists.txt +++ b/src/yuzu/CMakeLists.txt @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project +# SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project # SPDX-License-Identifier: GPL-3.0-or-later set(CMAKE_AUTOMOC ON) @@ -426,12 +426,6 @@ if (WIN32 AND NOT YUZU_USE_BUNDLED_QT AND QT_VERSION VERSION_GREATER_EQUAL 6) add_custom_command(TARGET yuzu POST_BUILD COMMAND ${WINDEPLOYQT_EXECUTABLE} "${YUZU_EXE_DIR}/eden.exe" --dir "${YUZU_EXE_DIR}" --libdir "${YUZU_EXE_DIR}" --plugindir "${YUZU_EXE_DIR}/plugins" --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --no-translations --verbose 0) endif() -# TODO(crueter): this can be done with system qt in a better way -if (YUZU_USE_BUNDLED_QT) - include(CopyYuzuQt6Deps) - copy_yuzu_Qt6_deps(yuzu) -endif() - if (ENABLE_SDL2) target_link_libraries(yuzu PRIVATE SDL2::SDL2) target_compile_definitions(yuzu PRIVATE HAVE_SDL2) @@ -443,7 +437,6 @@ endif() if (YUZU_ROOM) target_link_libraries(yuzu PRIVATE yuzu-room) -target_link_libraries(yuzu PRIVATE Qt6::Widgets) endif() if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD)) @@ -455,8 +448,9 @@ if (NOT MSVC AND (APPLE OR NOT YUZU_STATIC_BUILD)) -Wno-missing-field-initializers) endif() -if (YUZU_STATIC_BUILD AND MINGW) - static_qt_link(yuzu) +# Remember that the linker is incredibly stupid. +if (YUZU_STATIC_BUILD AND MINGW AND ARCHITECTURE_x86_64 AND ENABLE_OPENSSL) + target_link_libraries(yuzu PRIVATE OpenSSL::SSL OpenSSL::Crypto) endif() create_target_directory_groups(yuzu) |