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.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'CMake/android.cmake') diff --git a/CMake/android.cmake b/CMake/android.cmake index b5db954cf..9fc78d828 100644 --- a/CMake/android.cmake +++ b/CMake/android.cmake @@ -31,8 +31,8 @@ configure_file( # create a custom abi file for this setup configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/abi-version.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/FL/abi-version.h" + "${CMAKE_CURRENT_SOURCE_DIR}/fl_config.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/AndroidStudio/FL/fl_config.h" @ONLY ) -- cgit v1.2.3