Skip to content

Commit

Permalink
Wayland fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
ggarra13 committed Sep 13, 2024
1 parent 76cc807 commit 387e8d4
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 1 deletion.
11 changes: 10 additions & 1 deletion cmake/Modules/BuildFLTK.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,14 @@ endif()
set(FLTK_USE_SYSTEM_ZLIB TRUE)
set(FLTK_USE_SYSTEM_LIBPNG TRUE)

# We set this to use FLTK's built-in libdecor
set(FLTK_USE_SYSTEM_LIBDECOR FALSE)

# Set this to FALSE to use libdecor's uglier looking windows' borders
# instead of GTK's nicer window borders. Note that using GTK's borders will
# result in a warning due to FLTK and GLFW calling the same function.
set(FLTK_USE_LIBDECOR_GTK ON)

# This one may be turned off
set(FLTK_USE_SYSTEM_LIBJPEG FALSE)
if(TLRENDER_JPEG)
Expand Down Expand Up @@ -82,7 +90,8 @@ ExternalProject_Add(
-DFLTK_BUILD_SHARED_LIBS=${FLTK_BUILD_SHARED_LIBS}
-DFLTK_BACKEND_WAYLAND=${TLRENDER_WAYLAND}
-DFLTK_BACKEND_X11=${TLRENDER_X11}
-DFLTK_USE_SYSTEM_LIBDECOR=0
-DFLTK_USE_SYSTEM_LIBDECOR=${FLTK_USE_SYSTEM_LIBDECOR}
-DFLTK_USE_LIBDECOR_GTK=${FLTK_USE_LIBDECOR_GTK}
-DFLTK_USE_SYSTEM_ZLIB=${FLTK_USE_SYSTEM_ZLIB}
-DFLTK_USE_SYSTEM_LIBJPEG=${FLTK_USE_SYSTEM_LIBJPEG}
-DFLTK_USE_SYSTEM_LIBPNG=${FLTK_USE_SYSTEM_LIBPNG}
Expand Down
1 change: 1 addition & 0 deletions src/docs/HISTORY.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ v1.2.7
- Improved hotkey selection/display when using shift on some international
keyboards.
- Added explanation when FFmpeg Color Accuracy is on to explain slow conversion.
- Wayland crashing fix.


v1.2.6
Expand Down

0 comments on commit 387e8d4

Please sign in to comment.