diff options
| author | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-03-09 13:21:49 +0200 |
|---|---|---|
| committer | Albrecht Schlosser <albrechts.fltk@online.de> | 2023-03-09 17:34:05 +0100 |
| commit | 5175192755e57d1d7016253d48f34f9d0c2c0832 (patch) | |
| tree | 6262a13668d6ea56067910b024516c60305e374e /src/makedepend | |
| parent | e32d4bcab990c2648bbcf550d115a5393c3f50e2 (diff) | |
CMake: build shared libs with OPTION_CAIROEXT (issue #250)
- remove separate libfltk_cairo to avoid cyclic dependencies, but
- keep a dummy libfltk_cairo in 1.4.0 for backwards compatibility
- move cairo/Fl_Cairo.cxx to src/Fl_Cairo.cxx
- add preliminary Cairo support for Visual Studio (MSVC)
Static linking is not affected by this change, but users building
with hand-made Makefiles will have to remove libfltk_cairo starting
with FLTK 1.4.0. The dummy library can be linked for backwards
compatibility but it will be removed later (in 1.4.x or 1.5.0).
The shared FLTK library libfltk.{so|dylib|dll|..} depends on libcairo
if and only if FLTK is built with one of the Cairo options. This has
always been the case for OPTION_CAIROEXT but is now also true if only
OPTION_CAIRO is selected, i.e. FLTK programs linked with a Cairo
enabled shared FLTK library will also be linked with libcairo. The same
is true for configure options --enable-cairo and --enable-cairoext,
respectively.
Preliminary Cairo support for MSVC now detects a Cairo installation
using the CMake variable FLTK_CAIRO_DIR which must be set by the user.
Note that this feature is temporary and may be changed in the future
for a better and more comfortable version.
Diffstat (limited to 'src/makedepend')
| -rw-r--r-- | src/makedepend | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/src/makedepend b/src/makedepend index 74f3f2d87..bd259df7b 100644 --- a/src/makedepend +++ b/src/makedepend @@ -1279,6 +1279,23 @@ Fl_Button.o: ../FL/fl_utf8.h Fl_Button.o: ../FL/Fl_Widget.H Fl_Button.o: ../FL/Fl_Window.H Fl_Button.o: ../FL/platform_types.h +Fl_Cairo.o: ../FL/Enumerations.H +Fl_Cairo.o: ../FL/Fl.H +Fl_Cairo.o: ../FL/fl_attr.h +Fl_Cairo.o: ../FL/Fl_Bitmap.H +Fl_Cairo.o: ../FL/Fl_Cairo.H +Fl_Cairo.o: ../FL/fl_casts.H +Fl_Cairo.o: ../FL/fl_config.h +Fl_Cairo.o: ../FL/Fl_Export.H +Fl_Cairo.o: ../FL/Fl_Group.H +Fl_Cairo.o: ../FL/Fl_Image.H +Fl_Cairo.o: ../FL/fl_types.h +Fl_Cairo.o: ../FL/fl_utf8.h +Fl_Cairo.o: ../FL/Fl_Widget.H +Fl_Cairo.o: ../FL/Fl_Window.H +Fl_Cairo.o: ../FL/platform.H +Fl_Cairo.o: ../FL/platform_types.h +Fl_Cairo.o: ../FL/x11.H Fl_Chart.o: ../config.h Fl_Chart.o: ../FL/Enumerations.H Fl_Chart.o: ../FL/Fl.H @@ -2313,6 +2330,7 @@ Fl_Help_View.o: ../FL/Fl_RGB_Image.H Fl_Help_View.o: ../FL/Fl_Scrollbar.H Fl_Help_View.o: ../FL/Fl_Shared_Image.H Fl_Help_View.o: ../FL/Fl_Slider.H +Fl_Help_View.o: ../FL/Fl_String.H Fl_Help_View.o: ../FL/fl_string_functions.h Fl_Help_View.o: ../FL/fl_types.h Fl_Help_View.o: ../FL/fl_utf8.h @@ -3219,6 +3237,7 @@ Fl_Preferences.o: ../FL/fl_config.h Fl_Preferences.o: ../FL/Fl_Export.H Fl_Preferences.o: ../FL/Fl_Plugin.H Fl_Preferences.o: ../FL/Fl_Preferences.H +Fl_Preferences.o: ../FL/Fl_String.H Fl_Preferences.o: ../FL/fl_string_functions.h Fl_Preferences.o: ../FL/fl_types.h Fl_Preferences.o: ../FL/fl_utf8.h @@ -3613,6 +3632,22 @@ fl_shortcut.o: ../FL/platform_types.h fl_shortcut.o: flstring.h fl_shortcut.o: Fl_Screen_Driver.H fl_shortcut.o: Fl_System_Driver.H +Fl_Shortcut_Button.o: ../config.h +Fl_Shortcut_Button.o: ../FL/Enumerations.H +Fl_Shortcut_Button.o: ../FL/Fl.H +Fl_Shortcut_Button.o: ../FL/fl_attr.h +Fl_Shortcut_Button.o: ../FL/Fl_Button.H +Fl_Shortcut_Button.o: ../FL/Fl_Cairo.H +Fl_Shortcut_Button.o: ../FL/fl_casts.H +Fl_Shortcut_Button.o: ../FL/fl_config.h +Fl_Shortcut_Button.o: ../FL/fl_draw.H +Fl_Shortcut_Button.o: ../FL/Fl_Export.H +Fl_Shortcut_Button.o: ../FL/Fl_Shortcut_Button.H +Fl_Shortcut_Button.o: ../FL/fl_types.h +Fl_Shortcut_Button.o: ../FL/fl_utf8.h +Fl_Shortcut_Button.o: ../FL/Fl_Widget.H +Fl_Shortcut_Button.o: ../FL/platform_types.h +Fl_Shortcut_Button.o: flstring.h fl_show_colormap.o: ../config.h fl_show_colormap.o: ../FL/Enumerations.H fl_show_colormap.o: ../FL/Fl.H @@ -3691,6 +3726,7 @@ Fl_Spinner.o: ../FL/Fl_Rect.H Fl_Spinner.o: ../FL/Fl_Repeat_Button.H Fl_Spinner.o: ../FL/Fl_Spinner.H Fl_Spinner.o: ../FL/Fl_Widget.H +Fl_String.o: ../FL/Fl_Export.H Fl_String.o: ../FL/Fl_String.H fl_string_functions.o: ../FL/Enumerations.H fl_string_functions.o: ../FL/filename.H @@ -4929,6 +4965,7 @@ gl_start.o: Fl_Gl_Window_Driver.H numericsort.o: ../FL/filename.H numericsort.o: ../FL/fl_config.h numericsort.o: ../FL/Fl_Export.H +numericsort.o: ../FL/fl_utf8.h numericsort.o: ../FL/platform_types.h print_button.o: ../FL/Enumerations.H print_button.o: ../FL/Fl.H |
