From 5438954d8c6213f1b0cc9d23b70ffaae388e1d60 Mon Sep 17 00:00:00 2001 From: Albrecht Schlosser Date: Sat, 18 Dec 2021 22:42:30 +0100 Subject: Generate FL/fl_config.h rather than FL/abi-version.h ... as discussed in fltk.coredev in thread "RFC: introduce public config header ", see: https://groups.google.com/g/fltkcoredev/c/xLCs1AIXMVo/m/MHZpQggzAQAJ - Rename abi-version.h to fl_config.h, rename input files, update dependencies, .gitignore, CMake, configure and Makefiles. - Include Cairo options in FL/fl_config.h - Rename FLTK_USE_CAIRO to FLTK_HAVE_CAIROEXT for consistency. - Include in config.h and wherever necessary, fix include order (move FL/Fl.H to the top) and more. - Move USE_X11 to fl_config.h and rename to FLTK_USE_X11 - Do not include in Cairo demo program which is no longer required in Cairo programs since FLTK 1.4.0 --- src/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Makefile') diff --git a/src/Makefile b/src/Makefile index 3c1225b21..47c0615cc 100644 --- a/src/Makefile +++ b/src/Makefile @@ -698,7 +698,7 @@ drivers/X11/Fl_X11_Screen_Driver.o: Xutf8.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../config.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Font.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: drivers/Xlib/Fl_Xlib_Graphics_Driver.H -drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/abi-version.h +drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/fl_config.h drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Enumerations.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Bitmap.H drivers/Xlib/Fl_Xlib_Graphics_Driver_font_x.o: ../FL/Fl_Device.H -- cgit v1.2.3