Skip to content
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

Bump GLFW to 3.4, fix Wayland Configurations #16

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Bump GLFW to 3.4, fix Wayland Configurations #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
36b501c
Bump GLFW to 3.4, adapt CMakeLists to set the correct flags by automa…
wi-re Nov 6, 2024
1929d59
Merge branch 'main' into fix-wayland
wi-re Nov 6, 2024
d9939f3
Disable fps uncap on wayland (see https://docs.rs/wgpu/latest/wgpu/en…
wi-re Nov 6, 2024
8b41382
Bump webgpu version, requires rewrite to swapchain functionality as t…
wi-re Nov 7, 2024
d7803fb
Minor Cleanups
wi-re Nov 7, 2024
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
71 changes: 68 additions & 3 deletions 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.1...3.25)
cmake_minimum_required(VERSION 3.16...3.25)

project(
GamePhysicsTemplate
Expand All @@ -10,10 +10,56 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED On)
set(CMAKE_CXX_EXTENSIONS Off)

option(DEV_MODE "Set up development helper settings" ON)
option(USE_WAYLAND "Use Wayland instead of X11" OFF)
option(USE_X11 "Use X11 instead of Wayland" OFF)
if (USE_WAYLAND AND USE_X11)
message(FATAL_ERROR "You can't use both Wayland and X11 at the same time")
endif()

add_subdirectory(thirdparty/glfw)
if(UNIX AND NOT APPLE)
if (DEFINED ENV{XDG_SESSION_TYPE})
if ($ENV{XDG_SESSION_TYPE} STREQUAL "x11")
set(GLFW_BUILD_X11 TRUE)
set(GLFW_BUILD_WAYLAND FALSE)
message(" Using X11 (detected via XDG_SESSION_TYPE)" )
else()
set(GLFW_BUILD_X11 FALSE)
set(GLFW_BUILD_WAYLAND TRUE)
message("Using Wayland (detected via XDG_SESSION_TYPE)")
endif()
else()
set(GLFW_BUILD_WAYLAND TRUE)
set(GLFW_BUILD_X11 FALSE)
message("Odd Configuration detected, XDG_SESSION_TYPE not set! If you are on WSL2 this is expected, otherwise make sure your display settings are sane.")
endif()
endif(UNIX AND NOT APPLE)

# Compatibility fixes for GLFW
# Older versions used GLFW_USE_WAYLAND and GLFW_USE_X11
# Newer versions use GLFW_BUILD_WAYLAND and GLFW_BUILD_X11
# We need to make sure that the correct one is set for older versions
if (DEFINED GLFW_USE_WAYLAND)
unset(GLFW_USE_WAYLAND CACHE)
set(GLFW_BUILD_WAYLAND TRUE)
set(GLFW_BUILD_X11 FALSE)
elseif(DEFINED GLFW_USE_X11)
unset(GLFW_USE_X11 CACHE)
set(GLFW_BUILD_X11 TRUE)
set(GLFW_BUILD_WAYLAND FALSE)
endif()

if(USE_WAYLAND)
set(GLFW_BUILD_WAYLAND TRUE)
set(GLFW_BUILD_X11 FALSE)
elseif(USE_X11)
set(GLFW_BUILD_X11 TRUE)
set(GLFW_BUILD_WAYLAND FALSE)
endif()


option(DEV_MODE "Set up development helper settings" ON)
add_subdirectory(thirdparty/webgpu)
add_subdirectory(thirdparty/glfw)
add_subdirectory(thirdparty/glfw3webgpu)
add_subdirectory(thirdparty/imgui)

Expand All @@ -39,6 +85,25 @@ add_executable(Template
src/Colormap.cpp
)

if(UNIX AND NOT APPLE)
if (DEFINED ENV{XDG_SESSION_TYPE})
if ($ENV{XDG_SESSION_TYPE} STREQUAL "x11")
target_compile_definitions(Template PUBLIC _GLFW_X11=1)
target_compile_definitions(imgui PUBLIC _GLFW_X11=1)
target_compile_definitions(glfw3webgpu PUBLIC _GLFW_X11=1)
else()
target_compile_definitions(Template PUBLIC _GLFW_WAYLAND=1)
target_compile_definitions(imgui PUBLIC _GLFW_WAYLAND=1)
target_compile_definitions(glfw3webgpu PUBLIC _GLFW_WAYLAND=1)
message("Using Wayland!")
endif()
else()
target_compile_definitions(Template PUBLIC _GLFW_WAYLAND=1)
target_compile_definitions(imgui PUBLIC _GLFW_WAYLAND=1)
target_compile_definitions(glfw3webgpu PUBLIC _GLFW_WAYLAND=1)
endif()
endif(UNIX AND NOT APPLE)

target_compile_definitions(Template PRIVATE
GLM_FORCE_RIGHT_HANDED
GLM_FORCE_DEPTH_ZERO_TO_ONE
Expand Down
Loading