Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,8 @@
path = Externals/wil
url = https://github.com/microsoft/wil.git
shallow = true
[submodule "DolRecomp"]
path = DolRecomp
url = https://github.com/ExpansionPak/DolRecomp.git
branch = main
shallow = true
24 changes: 21 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ if(UNIX AND NOT APPLE AND NOT ANDROID)
endif()
if(NOT WIN32 AND NOT APPLE AND NOT HAIKU)
option(ENABLE_EGL "Enables EGL OpenGL Interface" ON)
option(ENABLE_WAYLAND "Enables Wayland Support" ON)
endif()

if(NOT ANDROID)
Expand Down Expand Up @@ -499,15 +500,24 @@ if (OPENGL_GL)
include_directories(${OPENGL_INCLUDE_DIR})
endif()

if(ENABLE_WAYLAND)
pkg_check_modules(WAYLAND wayland-client IMPORTED_TARGET GLOBAL)
if(WAYLAND_FOUND)
message(STATUS "Wayland support enabled")
else()
message(WARNING "Wayland support enabled but not found. This build will not support Wayland.")
endif()
endif()

if(ENABLE_X11)
pkg_check_modules(X11 x11 IMPORTED_TARGET)
pkg_check_modules(X11 x11 IMPORTED_TARGET GLOBAL)
if(X11_FOUND)
add_definitions(-DHAVE_X11=1)
pkg_check_modules(XRANDR xrandr IMPORTED_TARGET)
pkg_check_modules(XRANDR xrandr IMPORTED_TARGET GLOBAL)
if(XRANDR_FOUND)
add_definitions(-DHAVE_XRANDR=1)
endif()
pkg_check_modules(X11_INPUT REQUIRED xi>=1.5.0 IMPORTED_TARGET)
pkg_check_modules(X11_INPUT REQUIRED xi>=1.5.0 IMPORTED_TARGET GLOBAL)
message(STATUS "X11 support enabled")
else()
message(WARNING "X11 support enabled but not found. This build will not support X11.")
Expand Down Expand Up @@ -712,6 +722,14 @@ endif()

if(ENABLE_SDL)
dolphin_find_optional_system_library(SDL3 Externals/SDL 3.2.0)
# ModernGekko's standalone ImGui launcher is declared by the parent project.
# Make the distro SDL target visible outside this directory when one is used.
if(TARGET SDL3::SDL3-shared)
get_target_property(_moderngekko_sdl_alias SDL3::SDL3-shared ALIASED_TARGET)
if(NOT _moderngekko_sdl_alias)
set_property(TARGET SDL3::SDL3-shared PROPERTY IMPORTED_GLOBAL TRUE)
endif()
endif()
endif()

dolphin_find_optional_system_library(SFML Externals/SFML 3.0 COMPONENTS Network System)
Expand Down
1 change: 1 addition & 0 deletions DolRecomp
Submodule DolRecomp added at f0a86b
16 changes: 0 additions & 16 deletions DolRecomp/.gitattributes

This file was deleted.

21 changes: 0 additions & 21 deletions DolRecomp/.github/workflows/ci.yml

This file was deleted.

53 changes: 0 additions & 53 deletions DolRecomp/.github/workflows/cmake-single-platform.yml

This file was deleted.

58 changes: 0 additions & 58 deletions DolRecomp/.gitignore

This file was deleted.

Loading