Skip to content

Commit d0c0a7a

Browse files
whitequarkwhitequark
committed
Remove FLTK port.
It provides no value over the native GTK and Cocoa ports.
1 parent bbe4999 commit d0c0a7a

File tree

6 files changed

+20
-1438
lines changed

6 files changed

+20
-1438
lines changed

‎CMakeLists.txt‎

Lines changed: 15 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ set(solvespace_VERSION_MAJOR 2)
2020
set(solvespace_VERSION_MINOR 1)
2121

2222
if(NOT WIN32)
23-
set(GUI gtk2 CACHE STRING "GUI toolkit to use (one of: fltk gtk2 gtk3)")
23+
set(GUI gtk2 CACHE STRING "GUI toolkit to use (one of: gtk2 gtk3)")
2424
endif()
2525

2626
# compiler
@@ -76,29 +76,22 @@ elseif(APPLE)
7676
find_package(PNG REQUIRED)
7777
find_library(APPKIT_LIBRARY AppKit REQUIRED)
7878
else() # Linux and compatible systems
79-
find_package(PNG REQUIRED)
8079
find_package(SpaceWare)
8180

82-
if(GUI STREQUAL "fltk")
83-
# Find the packages the old-fashioned way. Doesn't require
84-
# the system to follow freedesktop standards.
85-
find_package(FLTK REQUIRED)
86-
CHECK_INCLUDE_FILE("fontconfig/fontconfig.h" HAVE_FONTCONFIG)
87-
elseif(GUI STREQUAL "gtk3" OR GUI STREQUAL "gtk2")
88-
# Use freedesktop's pkg-config to locate everything.
89-
find_package(PkgConfig REQUIRED)
90-
pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
91-
pkg_check_modules(JSONC REQUIRED json-c)
92-
pkg_check_modules(GLEW REQUIRED glew)
93-
94-
set(HAVE_GTK TRUE)
95-
if(GUI STREQUAL "gtk3")
96-
set(HAVE_GTK3 TRUE)
97-
pkg_check_modules(GTKMM REQUIRED gtkmm-3.0 pangomm-1.4 x11)
98-
else()
99-
set(HAVE_GTK2 TRUE)
100-
pkg_check_modules(GTKMM REQUIRED gtkmm-2.4 pangomm-1.4 x11)
101-
endif()
81+
# Use freedesktop's pkg-config to locate everything.
82+
find_package(PkgConfig REQUIRED)
83+
pkg_check_modules(PNG REQUIRED libpng)
84+
pkg_check_modules(FONTCONFIG REQUIRED fontconfig)
85+
pkg_check_modules(JSONC REQUIRED json-c)
86+
pkg_check_modules(GLEW REQUIRED glew)
87+
88+
set(HAVE_GTK TRUE)
89+
if(GUI STREQUAL "gtk3")
90+
set(HAVE_GTK3 TRUE)
91+
pkg_check_modules(GTKMM REQUIRED gtkmm-3.0 pangomm-1.4 x11)
92+
elseif(GUI STREQUAL "gtk2")
93+
set(HAVE_GTK2 TRUE)
94+
pkg_check_modules(GTKMM REQUIRED gtkmm-2.4 pangomm-1.4 x11)
10295
else()
10396
message(FATAL_ERROR "GUI unrecognized: ${GUI}")
10497
endif()

‎src/CMakeLists.txt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ if(SPACEWARE_FOUND)
2929
endif()
3030

3131
set(HAVE_SPACEWARE ${SPACEWARE_FOUND})
32-
set(HAVE_FLTK ${FLTK_FOUND})
3332
set(HAVE_GTK ${GTKMM_FOUND})
3433
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/config.h.in"
3534
"${CMAKE_CURRENT_BINARY_DIR}/config.h")
@@ -153,15 +152,6 @@ elseif(APPLE)
153152

154153
set(platform_LIBRARIES
155154
${APPKIT_LIBRARY})
156-
elseif(HAVE_FLTK)
157-
include_directories(${FLTK_INCLUDE_DIR})
158-
159-
set(platform_SOURCES
160-
fltk/fltkmain.cpp)
161-
162-
set(platform_LIBRARIES
163-
${CMAKE_DL_LIBS}
164-
${FLTK_LIBRARIES})
165155
elseif(HAVE_GTK)
166156
include_directories(
167157
${GTKMM_INCLUDE_DIRS}

‎src/config.h.in‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,4 @@
1313
#cmakedefine HAVE_GTK2
1414
#cmakedefine HAVE_GTK3
1515

16-
#cmakedefine HAVE_FLTK
17-
18-
/* Only relevant for FLTK port. */
19-
#ifdef HAVE_FLTK
20-
#define HAVE_FLTK_FULLSCREEN
21-
#endif
22-
23-
#cmakedefine HAVE_FONTCONFIG
24-
2516
#endif

0 commit comments

Comments
 (0)