Skip to content

Use RT64_SDL_WINDOW_VULKAN to guard X11 detection instead of adding a new define. #24

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

Merged
klorfmorf merged 1 commit into from
Jul 25, 2025
Merged

Use RT64_SDL_WINDOW_VULKAN to guard X11 detection instead of adding a new define. #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 2 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ endif()

if (CMAKE_SYSTEM_NAME MATCHES "Linux")
option(RECOMP_FLATPAK "Configure the build for Flatpak compatibility." OFF)
option(LINUX_USE_WAYLAND "Use Wayland instead of legacy X11 on GNU/Linux" OFF)
endif()

# Avoid warning about DOWNLOAD_EXTRACT_TIMESTAMP in CMake 3.24:
Expand Down Expand Up @@ -310,14 +309,11 @@ endif()

if (CMAKE_SYSTEM_NAME MATCHES "Linux")
find_package(SDL2 REQUIRED)
if (NOT LINUX_USE_WAYLAND)
if (NOT RT64_SDL_WINDOW_VULKAN)
find_package(X11 REQUIRED)
endif()

add_compile_definitions("RT64_SDL_WINDOW_VULKAN")
if(LINUX_USE_WAYLAND)
add_compile_definitions("LINUX_USE_WAYLAND")
endif()

# Generate icon_bytes.c from the app icon PNG.
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.c ${CMAKE_CURRENT_BINARY_DIR}/icon_bytes.h
Expand All @@ -331,7 +327,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "Linux")

target_include_directories(Goemon64Recompiled PRIVATE ${SDL2_INCLUDE_DIRS})

if (NOT LINUX_USE_WAYLAND)
if (NOT RT64_SDL_WINDOW_VULKAN)
message(STATUS "X11_FOUND = ${X11_FOUND}")
message(STATUS "X11_Xrandr_FOUND = ${X11_Xrandr_FOUND}")
message(STATUS "X11_INCLUDE_DIR = ${X11_INCLUDE_DIR}")
Expand Down
Loading