Skip to content

Fix Linux build compatibility issues #63

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
blasphemetheus wants to merge 2 commits into from
Closed

Fix Linux build compatibility issues #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62ab219
Fix Linux build compatibility issues
blasphemetheus Jan 5, 2026
3d3e892
Make Qt6::GuiPrivate optional for CI compatibility
blasphemetheus Jan 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -672,7 +672,7 @@ dolphin_make_imported_target_if_missing(LibLZMA::LibLZMA LIBLZMA)

dolphin_find_optional_system_library_pkgconfig(ZSTD libzstd>=1.4.0 zstd::zstd Externals/zstd)

dolphin_find_optional_system_library_pkgconfig(ZLIB zlib-ng ZLIB::ZLIB Externals/zlib-ng)
dolphin_find_optional_system_library_pkgconfig(ZLIB zlib ZLIB::ZLIB Externals/zlib-ng)

dolphin_find_optional_system_library_pkgconfig(MINIZIP
"minizip>=4.0.4" minizip::minizip Externals/minizip-ng
Expand Down
2 changes: 1 addition & 1 deletion Externals/discord-rpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 3.2.0)
cmake_minimum_required (VERSION 3.5)
project (DiscordRPC)

include(GNUInstallDirs)
Expand Down
3 changes: 3 additions & 0 deletions Externals/minizip-ng/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
project(minizip C)

include(CheckFunctionExists)
include(CheckIncludeFile)

add_library(minizip STATIC
minizip-ng/mz.h
minizip-ng/mz_compat.c
Expand Down
5 changes: 5 additions & 0 deletions Source/Core/DolphinQt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTORCC ON)

find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets Svg)
find_package(Qt6 QUIET COMPONENTS GuiPrivate)
message(STATUS "Found Qt version ${Qt6_VERSION}")

set_property(TARGET Qt6::Core PROPERTY INTERFACE_COMPILE_FEATURES "")
Expand Down Expand Up @@ -425,6 +426,10 @@ PRIVATE
implot
)

if(TARGET Qt6::GuiPrivate)
target_link_libraries(dolphin-emu PRIVATE Qt6::GuiPrivate)
endif()

if (WIN32)
target_link_libraries(dolphin-emu
PRIVATE
Expand Down
Loading