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 --- CMake/Android/abi-version.cmake.in | 25 ------------------------- CMake/Android/fl_config.cmake.in | 25 +++++++++++++++++++++++++ 2 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 CMake/Android/abi-version.cmake.in create mode 100644 CMake/Android/fl_config.cmake.in (limited to 'CMake/Android') diff --git a/CMake/Android/abi-version.cmake.in b/CMake/Android/abi-version.cmake.in deleted file mode 100644 index 5200197a9..000000000 --- a/CMake/Android/abi-version.cmake.in +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Configuration file for the Fast Light Tool Kit (FLTK). - * - * Copyright 1998-2020 by Bill Spitzak and others. - * - * This library is free software. Distribution and use rights are outlined in - * the file "COPYING" which should have been included with this file. If this - * file is missing or damaged, see the license at: - * - * https://www.fltk.org/COPYING.php - * - * Please see the following page on how to report bugs and issues: - * - * https://www.fltk.org/bugs.php - */ - -/* - ============================================================================ - DO NOT EDIT - This file is generated by CMake ! - ============================================================================ -*/ - -/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */ - -/* #undef FL_ABI_VERSION */ diff --git a/CMake/Android/fl_config.cmake.in b/CMake/Android/fl_config.cmake.in new file mode 100644 index 000000000..5200197a9 --- /dev/null +++ b/CMake/Android/fl_config.cmake.in @@ -0,0 +1,25 @@ +/* + * Configuration file for the Fast Light Tool Kit (FLTK). + * + * Copyright 1998-2020 by Bill Spitzak and others. + * + * This library is free software. Distribution and use rights are outlined in + * the file "COPYING" which should have been included with this file. If this + * file is missing or damaged, see the license at: + * + * https://www.fltk.org/COPYING.php + * + * Please see the following page on how to report bugs and issues: + * + * https://www.fltk.org/bugs.php + */ + +/* + ============================================================================ + DO NOT EDIT - This file is generated by CMake ! + ============================================================================ +*/ + +/* define FL_ABI_VERSION as 10x0y for FLTK ABI version 1.x.y */ + +/* #undef FL_ABI_VERSION */ -- cgit v1.2.3