gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove from Doxygen files information about removed configure-based build system.

Browse Source
This commit is contained in:
ManoloFLTK 2025-09-08 12:49:41 +02:00
parent b69286f2ca
commit afc16b3331
5 changed files with 31 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
documentation/src/advanced.dox
View File

@ -97,13 +97,10 @@ with multithreaded programming issues; see the discussion of
To incorporate the locking mechanism in the library,
FLTK must be compiled with
\p --enable-threads set during the \p configure
process. IDE-based versions of FLTK are automatically compiled with
FLTK must be compiled with FLTK_USE_PTHREADS=On
set during the build process. This is the default since version 1.3.
IDE-based versions of FLTK are automatically compiled with
the locking mechanism incorporated if possible.
Since version 1.3, the
\p configure script that builds the FLTK
library also sets \p --enable-threads by default.
\section advanced_multithreading_lock_example Simple multithreaded examples using Fl::lock

46
documentation/src/bundled-libs.dox
View File

@ -109,8 +109,7 @@ Previous versions of bundled libraries (FLTK 1.3.x):
should be added in FLTK as well if they are necessary to build the
library. A simple "trial and error" should be sufficient to find files
that need to be added. Added files must be added to FLTK's build files
as well, usually to both `Makefile' and `CMakeLists.txt' to be used in
configure/make and in CMake based builds, respectively.
as well, usually `CMakeLists.txt', to be used in CMake based builds.
<h2>Upgrade order:</h2>
@ -122,9 +121,9 @@ Previous versions of bundled libraries (FLTK 1.3.x):
<h2>Tests after merge:</h2>
Tests should be done on as many platforms as possible, both with
autotools (configure/make) and CMake. Windows (Visual Studio) and
macOS (Xcode) builds need CMake to generate the IDE files.
Tests should be done on as many platforms as possible.
Windows (Visual Studio) and macOS (Xcode) builds need CMake to
generate the IDE files.
<h2>Upgrade notes for specific libraries:</h2>
@ -162,18 +161,12 @@ Previous versions of bundled libraries (FLTK 1.3.x):
find out which changes are required. The general rule is to change
all occurrences of 'z_' to 'fltk_z_' but there *are* exceptions.
The following files need special handling:
- CMakeLists.txt: Keep FLTK version, update manually if necessary.
- Makefile: Same as CMakeLists.txt.
- gzread.c: Merge changes (see above, manual merge recommended).
- zconf.h: Merge changes (see above, manual merge recommended).
- zlib.h: Merge changes (see above, manual merge recommended).
- makedepend: Keep this file.
Run `make depend' in the zlib folder on a Linux system after
the upgrade to update this file.
\section bundled-png png:
@ -195,13 +188,8 @@ Run `make depend' in the zlib folder on a Linux system after
The following files need special handling:
- CMakeLists.txt: Keep FLTK version, update manually if necessary.
- Makefile: Same as CMakeLists.txt.
- pnglibconf.h: Generate on a Linux system and merge (see above).
- pngprefix.h: Generate on a Linux system and merge (see above).
- makedepend: Keep this file.
Run `make depend' in the png folder on a Linux system after
the upgrade to update this file.
\section bundled-jpeg jpeg:
@ -232,14 +220,9 @@ Run `make depend' in the png folder on a Linux system after
The following files need special handling:
- CMakeLists.txt: Keep FLTK version, update manually if necessary.
- Makefile: Same as CMakeLists.txt.
- fltk_jpeg_prefix.h: Generate on a Linux system and merge (see above).
- jconfig.h: keep changes flagged with \verbatim /* FLTK */ \endverbatim
Note: more to come...
- makedepend: Keep this file.
Run `make depend' in the jpeg folder on a Linux system after
the upgrade to update this file.
\section bundled-nanosvg nanosvg:
@ -349,13 +332,16 @@ Run `make depend' in the jpeg folder on a Linux system after
\n Download: See website and follow links.
\n Repository: git clone https://gitlab.freedesktop.org/libdecor/libdecor.git
libdecor is used by the Wayland/X11 hybrid platform to draw window
titlebars when FLTK apps run as Wayland clients and the running
Wayland compositor uses client-side decoration. In the future, when
libdecor will have made its way into Linux packages, FLTK will use
the system version of libdecor. libdecor will remain as an FLTK bundle to
support Linux configurations where the libdecor package is not
available or not installed.
The Wayland/X11 hybrid platform of FLTK uses a software component called
\e libdecor when FLTK apps run as Wayland clients. It allows FLTK to detect whether
the Wayland compositor in use requires client-side window decoration
and to decorate windows if it does.
In recent Linux distributions, FLTK is linked with the \e libdecor-0.so
system library installed from software package \e libdecor-0-dev.
FLTK bundles a copy of the libdecor source code to
support Linux/Unix configurations where the \e libdecor-0-dev package is not
available, not recent enough, or not installed.
FLTK uses libdecor source files without any modification.
This part of the libdecor source tree is copied to directory libdecor/ of
@ -366,6 +352,6 @@ Run `make depend' in the jpeg folder on a Linux system after
src/ ... and files below except meson.build files
</pre>
Furthermore, directory libdecor/build/ of the FLTK source tree does not
originate from the libdecor source tree but contains 3 FLTK-created files.
File build/Makefile may need changes if a libdecor update adds or renames source files.
originate from the libdecor source tree but contains 4 FLTK-created files.
File src/CMakeLists.txt may need changes if a libdecor update adds or renames source files.
*/

3
documentation/src/drawing.dox
View File

@ -919,8 +919,7 @@ requires 4 bytes to store a Unicode character.
FLTK can draw accurately any Unicode-supported script for which the system
contains relevant fonts. Under X11 platforms, this requires
to build the library with the FLTK_USE_PANGO CMake option turned On
(or with configure --enable-pango).
to build the library with the FLTK_USE_PANGO CMake option turned On.
Plain text drawing starting at a user-given coordinate
is well supported by FLTK, including for right-to-left scripts.

5
documentation/src/wayland.dox
View File

@ -198,9 +198,8 @@ Fl_Image_Surface_Driver::newImageSurfaceDriver().</tt>
In special situations, such as with embedded systems equipped with the Wayland software but lacking
the X11 library, it's possible to build the FLTK library such as it contains only the Wayland backend.
This is achieved building FLTK with <tt>cmake -DFLTK_BACKEND_X11=OFF</tt> or with
<tt>configure --disable-x11</tt>. In that case, FL/fl_config.h does not define
\c FLTK_USE_X11.
This is achieved building FLTK with <tt>cmake -DFLTK_BACKEND_X11=OFF</tt>.
In that case, FL/fl_config.h does not define \c FLTK_USE_X11.
The rest of this chapter describes what happens when the Wayland leg has been chosen.

24
test/demo.cxx
View File

@ -17,11 +17,9 @@
/*
General information on directory structure and file handling.
The "classic" autotools/make system creates executables in their source
folders, i.e. fluid/fluid, test/demo and test/xyz, resp.. The menu file is
in folder test/, as is the main demo(.exe) program. In the following text
and directory lists all test and demo executables are represented by "demo"
and the fluid executable by "fluid", no matter what OS (under Windows: *.exe).
In the following text and directory lists all test and demo executables are
represented by "demo" and the fluid executable by "fluid", no matter what OS
(under Windows: *.exe).
The CMake build system generates all executables in the build tree and copies
the supporting test data files to the build tree as well. This structure is
@ -33,29 +31,23 @@
The overall structure, relative to the FLTK source dir (fltk) and the build
tree (build):
(1) Autotools / Make:
fltk/fluid fluid (../fluid/fluid)
fltk/test demo, demo.menu, working directory, data files
fltk/test/images images for help_dialog(.html)
(2) CMake + make (e.g. Unix)
(1) CMake + make (e.g. Unix)
build/bin fluid
build/bin/test test and demo programs
build/data demo.menu, working directory, data files
build/data/images images for help_dialog(.html)
(3) CMake + Visual Studio (TYPE == build type: Debug, Release, ...)
(2) CMake + Visual Studio (TYPE == build type: Debug, Release, ...)
build/bin/TYPE fluid
build/bin/test/TYPE test and demo programs
build/data demo.menu, working directory, data files
build/data/images images for help_dialog(.html)
(4) macOS The setup is similar to Windows and Linux:
Makefiles: like (1) or (2)
Xcode: like (3), i.e. similar to VS layout
(3) macOS The setup is similar to Windows and Linux:
Makefiles: like (1)
Xcode: like (2), i.e. similar to VS layout
The built executable 'demo' can also be executed with the menu filename
as commandline argument. In this case all the support (data) files are