diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-01-23 01:33:47 +0100 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2022-01-23 18:12:47 +0100 |
| commit | 04ccc8cc46c45b81e6138bec0b48a188c4ffe406 (patch) | |
| tree | 3ad8604f5d433dc6b6c294c28549a58dd57efcbd /src/CMakeLists.txt | |
| parent | b275ff07158e80d1744ddb2f6c51094a87cf079a (diff) | |
Remove experimental platforms Android, Pico, SDL (PR #376)
... as discussed in fltk.coredev: "FLTK 1.4.0 release schedule"
https://groups.google.com/g/fltkcoredev/c/PDbHTRpXVh0/m/JqboexZ_AwAJ
Diffstat (limited to 'src/CMakeLists.txt')
| -rw-r--r-- | src/CMakeLists.txt | 69 |
1 files changed, 4 insertions, 65 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 17c647987..bca6d98e2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -178,7 +178,7 @@ list (APPEND HEADER_FILES set (GL_HEADER_FILES) # FIXME: not (yet?) defined -if ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT) +if (FLTK_USE_X11 AND NOT OPTION_PRINT_SUPPORT) set (PSFILES ) else () @@ -186,7 +186,7 @@ else () drivers/PostScript/Fl_PostScript.cxx drivers/PostScript/Fl_PostScript_image.cxx ) -endif ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT) +endif (FLTK_USE_X11 AND NOT OPTION_PRINT_SUPPORT) set (DRIVER_FILES) @@ -241,35 +241,6 @@ if (FLTK_USE_X11) drivers/Xlib/Fl_Font.H ) -elseif (USE_SDL) - - # SDL2 - - set (DRIVER_FILES - drivers/Pico/Fl_Pico_System_Driver.cxx - drivers/Pico/Fl_Pico_Screen_Driver.cxx - drivers/Pico/Fl_Pico_Window_Driver.cxx - drivers/Pico/Fl_Pico_Graphics_Driver.cxx - drivers/Pico/Fl_Pico_Copy_Surface.cxx - drivers/Pico/Fl_Pico_Image_Surface.cxx - drivers/PicoSDL/Fl_PicoSDL_System_Driver.cxx - drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.cxx - drivers/PicoSDL/Fl_PicoSDL_Window_Driver.cxx - drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.cxx - drivers/PicoSDL/Fl_PicoSDL_Copy_Surface.cxx - drivers/PicoSDL/Fl_PicoSDL_Image_Surface.cxx - ) - set (DRIVER_HEADER_FILES - drivers/Pico/Fl_Pico_System_Driver.H - drivers/Pico/Fl_Pico_Screen_Driver.H - drivers/Pico/Fl_Pico_Window_Driver.H - drivers/Pico/Fl_Pico_Graphics_Driver.H - drivers/PicoSDL/Fl_PicoSDL_System_Driver.H - drivers/PicoSDL/Fl_PicoSDL_Screen_Driver.H - drivers/PicoSDL/Fl_PicoSDL_Window_Driver.H - drivers/PicoSDL/Fl_PicoSDL_Graphics_Driver.H - ) - elseif (APPLE) # Apple Quartz @@ -302,34 +273,6 @@ elseif (APPLE) drivers/Quartz/Fl_Font.H ) -elseif (ANDROID) - - # Android - - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - - set (DRIVER_FILES - drivers/Android/Fl_Android_Application.cxx - drivers/Android/Fl_Android_System_Driver.cxx - drivers/Android/Fl_Android_Screen_Driver.cxx - drivers/Android/Fl_Android_Screen_Keyboard.cxx - drivers/Android/Fl_Android_Window_Driver.cxx - drivers/Android/Fl_Android_Image_Surface_Driver.cxx - drivers/Android/Fl_Android_Graphics_Driver.cxx - drivers/Android/Fl_Android_Graphics_Clipping.cxx - drivers/Android/Fl_Android_Graphics_Font.cxx - ) - set (DRIVER_HEADER_FILES - drivers/Android/Fl_Android_Application.H - drivers/Android/Fl_Android_System_Driver.H - drivers/Android/Fl_Android_Screen_Driver.H - drivers/Android/Fl_Android_Window_Driver.H - drivers/Android/Fl_Android_Graphics_Driver.H - drivers/Android/Fl_Android_Graphics_Clipping.H - drivers/Android/Fl_Android_Graphics_Font.H - ) - - else () # Windows (GDI) @@ -473,7 +416,7 @@ if (WIN32) ) endif (WIN32) -if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) +if (APPLE AND (NOT OPTION_APPLE_X11)) set (MMFILES Fl_cocoa.mm drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -483,7 +426,7 @@ if (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) else() set (MMFILES ) -endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL)) +endif (APPLE AND (NOT OPTION_APPLE_X11)) ####################################################################### @@ -519,10 +462,6 @@ if (FLTK_USE_X11) list (APPEND OPTIONAL_LIBS ${X11_LIBRARIES}) endif (FLTK_USE_X11) -if (USE_SDL) - list (APPEND OPTIONAL_LIBS ${SDL2_LIBRARY}) -endif (USE_SDL) - if (WIN32) list (APPEND OPTIONAL_LIBS comctl32 ws2_32) endif (WIN32) |
