Generate FL/fl_config.h rather than FL/abi-version.h
... as discussed in fltk.coredev in thread "RFC: introduce public config header <FL/fl_config.h>", 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 <FL/fl_config.h> 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 <config.h> in Cairo demo program which is no longer required in Cairo programs since FLTK 1.4.0
This commit is contained in:
Albrecht Schlosser
parent
797616841c
commit
5438954d8c
2
.gitignore
vendored
2
.gitignore
vendored
@ -42,7 +42,7 @@ etc/FLTKConfig.cmake
|
||||
/TAGS
|
||||
|
||||
# /FL
|
||||
/FL/abi-version.h
|
||||
/FL/fl_config.h
|
||||
/FL/Makefile
|
||||
/FL/*.bck
|
||||
|
||||
|
||||
@ -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
|
||||
)
|
||||
|
||||
|
||||
@ -116,6 +116,11 @@ macro (CREATE_EXAMPLE NAME SOURCES LIBRARIES)
|
||||
set_target_properties (${TARGET_NAME} PROPERTIES OUTPUT_NAME ${NAME})
|
||||
target_link_libraries (${TARGET_NAME} ${LIBRARIES})
|
||||
|
||||
# we must link all programs with fltk_cairo if option CAIROEXT is enabled
|
||||
if (FLTK_HAVE_CAIROEXT)
|
||||
target_link_libraries (${TARGET_NAME} fltk_cairo cairo)
|
||||
endif ()
|
||||
|
||||
if (FLTK_HAVE_CAIRO)
|
||||
fl_target_link_directories (${TARGET_NAME} PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
|
||||
endif ()
|
||||
|
||||
@ -34,7 +34,7 @@ install (DIRECTORY
|
||||
DESTINATION ${FLTK_INCLUDEDIR} USE_SOURCE_PERMISSIONS
|
||||
FILES_MATCHING
|
||||
PATTERN "*.[hH]"
|
||||
PATTERN "abi-version.h" EXCLUDE
|
||||
PATTERN "fl_config.h" EXCLUDE
|
||||
)
|
||||
|
||||
install (DIRECTORY
|
||||
|
||||
@ -76,7 +76,7 @@ set (PATH_TO_XLIBS)
|
||||
if ((NOT APPLE OR OPTION_APPLE_X11) AND NOT WIN32)
|
||||
include (FindX11)
|
||||
if (X11_FOUND)
|
||||
set (USE_X11 1)
|
||||
set (FLTK_USE_X11 1)
|
||||
list (APPEND FLTK_LDLIBS -lX11)
|
||||
if (X11_Xext_FOUND)
|
||||
list (APPEND FLTK_LDLIBS -lXext)
|
||||
@ -164,7 +164,7 @@ option (OPTION_CAIROEXT
|
||||
)
|
||||
|
||||
set (FLTK_HAVE_CAIRO 0)
|
||||
set (FLTK_USE_CAIRO 0)
|
||||
set (FLTK_HAVE_CAIROEXT 0)
|
||||
|
||||
if (OPTION_CAIRO OR OPTION_CAIROEXT)
|
||||
pkg_search_module (PKG_CAIRO cairo)
|
||||
@ -174,7 +174,7 @@ if (OPTION_CAIRO OR OPTION_CAIROEXT)
|
||||
if (PKG_CAIRO_FOUND)
|
||||
set (FLTK_HAVE_CAIRO 1)
|
||||
if (OPTION_CAIROEXT)
|
||||
set (FLTK_USE_CAIRO 1)
|
||||
set (FLTK_HAVE_CAIROEXT 1)
|
||||
endif (OPTION_CAIROEXT)
|
||||
add_subdirectory (cairo)
|
||||
|
||||
|
||||
@ -142,8 +142,8 @@ include (CMake/variables.cmake)
|
||||
include (CMake/export.cmake)
|
||||
|
||||
configure_file (
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/abi-version.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/FL/abi-version.h
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/fl_config.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/FL/fl_config.h
|
||||
@ONLY
|
||||
)
|
||||
|
||||
|
||||
@ -24,13 +24,13 @@
|
||||
/*
|
||||
******************************************************************************
|
||||
* FL_ABI_VERSION is defined by configure or CMake since FLTK 1.3.4.
|
||||
* It is written to FL/abi-version.h and #included here.
|
||||
* It is written to FL/fl_config.h and #included here.
|
||||
******************************************************************************
|
||||
* For more informations on FL_ABI_VERSION see README.abi-version.txt.
|
||||
******************************************************************************
|
||||
*/
|
||||
|
||||
#include <FL/abi-version.h>
|
||||
#include <FL/fl_config.h>
|
||||
|
||||
# include "Fl_Export.H"
|
||||
# include "fl_types.h"
|
||||
|
||||
1
FL/Fl.H
1
FL/Fl.H
@ -21,6 +21,7 @@
|
||||
#ifndef Fl_H
|
||||
# define Fl_H
|
||||
|
||||
#include <FL/fl_config.h> // build configuration
|
||||
#include <FL/Fl_Export.H>
|
||||
#include <FL/platform_types.h> // for FL_SOCKET
|
||||
#include <FL/fl_casts.H> // experimental
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Main header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2016 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -20,6 +20,9 @@
|
||||
|
||||
#ifndef FL_CAIRO_H
|
||||
# define FL_CAIRO_H
|
||||
|
||||
# include <FL/fl_config.h> // build configuration
|
||||
|
||||
# ifdef FLTK_HAVE_CAIRO
|
||||
|
||||
// Cairo is currently supported for the following platforms:
|
||||
@ -39,7 +42,9 @@
|
||||
A private internal & unique corresponding object is created to
|
||||
permit cairo context state handling while keeping it opaque.
|
||||
For internal use only.
|
||||
\note Only available when configure has the --enable-cairo option
|
||||
\note Only available when configure has the --enable-cairo or
|
||||
--enable-cairoext option or one or both of the CMake options
|
||||
OPTION_CAIRO or OPTION_CAIROEXT is set (ON)
|
||||
*/
|
||||
class FL_EXPORT Fl_Cairo_State {
|
||||
public:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Main header file for the Fast Light Tool Kit (FLTK).
|
||||
// Cairo Window header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2018 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -20,6 +20,9 @@
|
||||
|
||||
#ifndef FL_CAIRO_WINDOW_H
|
||||
# define FL_CAIRO_WINDOW_H
|
||||
|
||||
#include <FL/fl_config.h>
|
||||
|
||||
# ifdef FLTK_HAVE_CAIRO
|
||||
|
||||
// Cairo is currently supported for the following platforms:
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Platform header file for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2020 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -28,6 +28,7 @@
|
||||
#if !defined(FL_PLATFORM_H) && !defined(FL_DOXYGEN)
|
||||
# define FL_PLATFORM_H
|
||||
|
||||
# include <FL/fl_config.h>
|
||||
# include <FL/Fl_Export.H>
|
||||
# include <FL/platform_types.h>
|
||||
# include <FL/fl_types.h> // for uchar
|
||||
@ -42,9 +43,6 @@ class Fl_Window;
|
||||
# else // X11
|
||||
# include <FL/fl_types.h>
|
||||
# include <FL/Enumerations.H>
|
||||
# if !defined(USE_X11)
|
||||
# define USE_X11 1
|
||||
# endif
|
||||
# if defined(_ABIN32) || defined(_ABI64) // fix for broken SGI Irix X .h files
|
||||
# pragma set woff 3322
|
||||
# endif
|
||||
@ -125,7 +123,7 @@ public:
|
||||
// static variables, static functions and member functions
|
||||
static Fl_X* first;
|
||||
static Fl_X* i(const Fl_Window* w) {return (Fl_X*)w->i;}
|
||||
# if defined(USE_X11) // for backward compatibility
|
||||
# if defined(FLTK_USE_X11) // for backward compatibility
|
||||
static void make_xid(Fl_Window*, XVisualInfo* =fl_visual, Colormap=fl_colormap);
|
||||
static Fl_X* set_xid(Fl_Window*, Window);
|
||||
# endif
|
||||
|
||||
2
Makefile
2
Makefile
@ -68,7 +68,7 @@ distclean: clean
|
||||
$(RM) fltk-config fltk.list makeinclude
|
||||
$(RM) fltk.spec
|
||||
$(RM) FL/Makefile
|
||||
$(RM) FL/abi-version.h
|
||||
$(RM) FL/fl_config.h
|
||||
$(RM) documentation/*.$(CAT1EXT)
|
||||
$(RM) documentation/*.$(CAT3EXT)
|
||||
$(RM) documentation/*.$(CAT6EXT)
|
||||
|
||||
@ -83,36 +83,6 @@ For more details, please have a look to the doxygen documentation,
|
||||
in the Modules section.
|
||||
|
||||
|
||||
Future considerations
|
||||
-----------------------
|
||||
|
||||
From Bill:
|
||||
First there is the FLTK_HAVE_CAIRO configuration option. This indicates that
|
||||
any Cairo calls are available. In this case you get something like this:
|
||||
|
||||
// static variable holding the last Cairo context FLTK set:
|
||||
cairo_t* Fl::cr;
|
||||
|
||||
// Make cr draw in this window. This hides the ugly platform-dependent
|
||||
// part of getting Cairo going:
|
||||
void Fl::cairo_make_current(Fl_Window*)
|
||||
|
||||
*** POST 1.3 potential Cairo use:
|
||||
// Set cr to something you made yourself. This lets you reuse functions
|
||||
// that use cr, and also tells FLTK that cr is not one of its own and
|
||||
// thus cannot be destroyed or reused for a different window:
|
||||
void Fl::cairo_make_current(cairo_t*)
|
||||
|
||||
Second there is the FLTK_USE_CAIRO configuration option. This means that all
|
||||
drawing is done using Cairo. In this case when a widget draw() method is
|
||||
called, it is exactly as though cairo_make_current(window) has been done.
|
||||
***
|
||||
|
||||
Note that it should be possible to compile so FLTK_HAVE_CAIRO works even
|
||||
if FLTK_USE_CAIRO does not, and so that turning on FLTK_USE_CAIRO does not
|
||||
break any programs written for FLTK_HAVE_CAIRO.
|
||||
|
||||
|
||||
PLATFORM SPECIFIC NOTES
|
||||
=========================
|
||||
|
||||
|
||||
@ -2,6 +2,15 @@
|
||||
------------------------------------------------------------
|
||||
|
||||
|
||||
|
||||
|
||||
––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
|
||||
*** CAUTION: This file is outdated. This needs a major rework! ***
|
||||
––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––––
|
||||
|
||||
|
||||
|
||||
|
||||
CONTENTS
|
||||
==========
|
||||
|
||||
@ -413,10 +422,9 @@ without adding link and include paths to the solution.
|
||||
|
||||
copy the entire FL directory into the include path
|
||||
|
||||
add all files from ide\VisualC2008\FL to the FL directory copied above
|
||||
(this is currently only one file: abi-version.h)
|
||||
add <build_dir>/FL/fl_config.h
|
||||
|
||||
copy all .lib files from the fltk lib directory to the VC lib directory
|
||||
copy all .lib files from the fltk build directory to the VC lib directory
|
||||
|
||||
copy fluid.exe in the fluid directory to the bin directory
|
||||
|
||||
|
||||
@ -40,7 +40,7 @@ and '1' is the major version number.
|
||||
The default ABI version for all FLTK 1.4.x versions is 10400 (the binary
|
||||
version of FLTK 1.4.0), but you can configure another version, e.g.
|
||||
10401 for FLTK 1.4.1 to enable the ABI features of FLTK 1.4.1 and all
|
||||
previous versions. See CHANGES file.
|
||||
previous versions. See CHANGES.txt file.
|
||||
|
||||
|
||||
Depending on how you build FLTK, there are two different ways to configure
|
||||
@ -57,7 +57,7 @@ the version number.
|
||||
./configure --with-abiversion=10401
|
||||
make
|
||||
|
||||
This will generate FL/abi-version.h and build FLTK as usual.
|
||||
This will generate FL/fl_config.h and build FLTK as usual.
|
||||
|
||||
Note: you should always make sure that you compile everything from
|
||||
scratch if you change the ABI version or any other configuration
|
||||
@ -110,7 +110,7 @@ the version number.
|
||||
General note on CMake:
|
||||
----------------------
|
||||
|
||||
CMake generates FL/abi-version.h in the build tree. You may run
|
||||
CMake generates FL/fl_config.h in the build tree. You may run
|
||||
'make install' to install the FLTK library including all headers in
|
||||
the chosen installation directory, although this is not necessary.
|
||||
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
/*
|
||||
ABI Configuration file for the Fast Light Tool Kit (FLTK).
|
||||
|
||||
============================================================================
|
||||
DO NOT EDIT - This file is generated by CMake !
|
||||
============================================================================
|
||||
|
||||
define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
|
||||
*/
|
||||
|
||||
#cmakedefine FL_ABI_VERSION @FL_ABI_VERSION@
|
||||
@ -1,11 +0,0 @@
|
||||
/*
|
||||
ABI Configuration file for the Fast Light Tool Kit (FLTK).
|
||||
|
||||
============================================================================
|
||||
DO NOT EDIT - This file is generated by configure !
|
||||
============================================================================
|
||||
|
||||
define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
|
||||
*/
|
||||
|
||||
#undef FL_ABI_VERSION
|
||||
@ -24,11 +24,11 @@
|
||||
// Cairo is currently supported for the following platforms:
|
||||
// Win32, Apple Quartz, X11
|
||||
|
||||
#if defined(USE_X11) // X11
|
||||
#if defined(FLTK_USE_X11) // X11
|
||||
# include <cairo-xlib.h>
|
||||
#elif defined(_WIN32)
|
||||
#elif defined(_WIN32) // Windows
|
||||
# include <cairo-win32.h>
|
||||
#elif defined(__APPLE_QUARTZ__) // PORTME: Cairo Support
|
||||
#elif defined(__APPLE_QUARTZ__) // macOS
|
||||
# include <cairo-quartz.h>
|
||||
#else
|
||||
# error Cairo is not supported on this platform.
|
||||
@ -43,7 +43,7 @@ Fl_Cairo_State Fl::cairo_state_; ///< contains all necessary info for cur
|
||||
// Fl_Cairo_State class impl
|
||||
|
||||
void Fl_Cairo_State::autolink(bool b) {
|
||||
#ifdef FLTK_USE_CAIRO
|
||||
#ifdef FLTK_HAVE_CAIROEXT
|
||||
autolink_ = b;
|
||||
#else
|
||||
Fl::fatal("In Fl::autolink(bool) : Cairo autolink() feature is only "
|
||||
@ -86,7 +86,7 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
|
||||
#ifndef __APPLE__
|
||||
float scale = Fl::screen_scale(wi->screen_num()); // get the screen scaling factor
|
||||
#endif
|
||||
#if defined(USE_X11)
|
||||
#if defined(FLTK_USE_X11)
|
||||
cairo_ctxt = Fl::cairo_make_current(0, wi->w() * scale, wi->h() * scale);
|
||||
#else
|
||||
// on macOS, scaling is done before by Fl_Window::make_current(), on Windows, the size is not used
|
||||
@ -105,7 +105,7 @@ cairo_t * Fl::cairo_make_current(Fl_Window* wi) {
|
||||
*/
|
||||
|
||||
static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
|
||||
# if defined(USE_X11)
|
||||
# if defined(FLTK_USE_X11)
|
||||
return cairo_xlib_surface_create(fl_display, fl_window, fl_visual->visual, W, H);
|
||||
# elif defined(_WIN32)
|
||||
return cairo_win32_surface_create((HDC) gc);
|
||||
@ -123,7 +123,7 @@ static cairo_surface_t * cairo_create_surface(void * gc, int W, int H) {
|
||||
*/
|
||||
cairo_t * Fl::cairo_make_current(void *gc) {
|
||||
int W=0,H=0;
|
||||
#if defined(USE_X11)
|
||||
#if defined(FLTK_USE_X11)
|
||||
// FIXME X11 get W,H
|
||||
// gc will be the window handle here
|
||||
// # warning FIXME get W,H for cairo_make_current(void*)
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
Fl_Cairo.o: ../config.h
|
||||
Fl_Cairo.o: ../FL/abi-version.h
|
||||
Fl_Cairo.o: ../FL/Enumerations.H
|
||||
Fl_Cairo.o: ../FL/Fl.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
|
||||
|
||||
@ -27,6 +27,12 @@
|
||||
* the latter either does not define the macro or defines it as 1.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Always include the public build configuration header
|
||||
*/
|
||||
|
||||
#include <FL/fl_config.h>
|
||||
|
||||
/*
|
||||
* Where to find files...
|
||||
*/
|
||||
@ -151,16 +157,6 @@
|
||||
|
||||
#cmakedefine __APPLE_QUARTZ__ 1
|
||||
|
||||
|
||||
/*
|
||||
* USE_X11
|
||||
*
|
||||
* Should we use X11 for the current platform
|
||||
*
|
||||
*/
|
||||
|
||||
#cmakedefine USE_X11 1
|
||||
|
||||
/*
|
||||
* USE_SDL
|
||||
*
|
||||
@ -271,23 +267,6 @@
|
||||
#cmakedefine HAVE_LIBZ 1
|
||||
#cmakedefine HAVE_LIBJPEG 1
|
||||
|
||||
/*
|
||||
* FLTK_USE_CAIRO
|
||||
*
|
||||
* Do we have the cairo library available and want extended cairo use in FLTK ?
|
||||
* This implies to link cairo.lib in all FLTK based apps.
|
||||
*/
|
||||
|
||||
#cmakedefine FLTK_USE_CAIRO 1
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIRO
|
||||
*
|
||||
* Do we have the cairo library available?
|
||||
*/
|
||||
|
||||
#cmakedefine FLTK_HAVE_CAIRO 1
|
||||
|
||||
/*
|
||||
* Which header file do we include for libpng?
|
||||
*/
|
||||
|
||||
33
configh.in
33
configh.in
@ -26,6 +26,12 @@
|
||||
* the latter either does not define the macro or defines it as 1.
|
||||
*/
|
||||
|
||||
/*
|
||||
* Always include the public build configuration header
|
||||
*/
|
||||
|
||||
#include <FL/fl_config.h>
|
||||
|
||||
/*
|
||||
* Where to find files...
|
||||
*/
|
||||
@ -150,16 +156,6 @@
|
||||
|
||||
#undef __APPLE_QUARTZ__
|
||||
|
||||
|
||||
/*
|
||||
* USE_X11
|
||||
*
|
||||
* Should we use X11 for the current platform
|
||||
*
|
||||
*/
|
||||
|
||||
#undef USE_X11
|
||||
|
||||
/*
|
||||
* USE_SDL
|
||||
*
|
||||
@ -271,23 +267,6 @@
|
||||
#undef HAVE_LIBZ
|
||||
#undef HAVE_LIBJPEG
|
||||
|
||||
/*
|
||||
* FLTK_USE_CAIRO
|
||||
*
|
||||
* Do we have the cairo library available and want extended cairo use in FLTK ?
|
||||
* This implies to link cairo.lib in all FLTK based apps.
|
||||
*/
|
||||
|
||||
#undef FLTK_USE_CAIRO
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIRO
|
||||
*
|
||||
* Do we have the cairo library available?
|
||||
*/
|
||||
|
||||
#undef FLTK_HAVE_CAIRO
|
||||
|
||||
/*
|
||||
* Which header file do we include for libpng?
|
||||
*/
|
||||
|
||||
@ -85,7 +85,8 @@ AC_SUBST(OPTIM)
|
||||
|
||||
|
||||
dnl Other options
|
||||
AC_ARG_ENABLE([cairo], AS_HELP_STRING([--enable-cairo], [use Cairo library])) AC_ARG_ENABLE([cairoext], AS_HELP_STRING([--enable-cairoext], [use FLTK code instrumentation for cairo extended use]))
|
||||
AC_ARG_ENABLE([cairo], AS_HELP_STRING([--enable-cairo], [use Cairo library]))
|
||||
AC_ARG_ENABLE([cairoext], AS_HELP_STRING([--enable-cairoext], [use FLTK code instrumentation for cairo extended use]))
|
||||
|
||||
AC_ARG_ENABLE([cp936], AS_HELP_STRING([--enable-cp936], [turn on CP936]))
|
||||
AS_IF([test x$enable_cp936 = xyes], [
|
||||
@ -220,7 +221,7 @@ CAIROLIBS=""
|
||||
|
||||
AS_IF([test x$enable_cairoext = xyes], [
|
||||
AS_IF([$PKGCONFIG --exists cairo], [
|
||||
AC_DEFINE([FLTK_USE_CAIRO])
|
||||
AC_DEFINE([FLTK_HAVE_CAIROEXT])
|
||||
AC_DEFINE([FLTK_HAVE_CAIRO])
|
||||
CAIRODIR="cairo"
|
||||
CAIROFLAGS="$($PKGCONFIG --cflags cairo)"
|
||||
@ -1010,7 +1011,7 @@ AS_CASE([$host_os_gui], [cygwin* | mingw*], [
|
||||
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$X_LIBS $LDFLAGS"
|
||||
DSOFLAGS="$X_LIBS $DSOFLAGS"
|
||||
AC_DEFINE([USE_X11])
|
||||
AC_DEFINE([FLTK_USE_X11])
|
||||
BUILD="X11"
|
||||
AS_IF([test "x$x_includes" != x], [
|
||||
ac_cpp="$ac_cpp -I$x_includes"
|
||||
@ -1615,7 +1616,7 @@ AC_SUBST([BINARY_DIR])
|
||||
|
||||
dnl Write all of the files...
|
||||
AC_CONFIG_HEADERS([config.h:configh.in])
|
||||
AC_CONFIG_HEADERS([FL/abi-version.h:abi-version.in])
|
||||
AC_CONFIG_HEADERS([FL/fl_config.h:fl_config.in])
|
||||
AC_CONFIG_FILES([makeinclude fltk.list fltk-config fltk.spec FL/Makefile])
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
53
fl_config.cmake.in
Normal file
53
fl_config.cmake.in
Normal file
@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Build configuration file for the Fast Light Tool Kit (FLTK).
|
||||
*
|
||||
* Copyright 1998-2021 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
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* FL_ABI_VERSION (ABI version):
|
||||
*
|
||||
* define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
|
||||
*/
|
||||
|
||||
#cmakedefine FL_ABI_VERSION @FL_ABI_VERSION@
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIRO
|
||||
*
|
||||
* Do we have the Cairo library available?
|
||||
*/
|
||||
|
||||
#cmakedefine FLTK_HAVE_CAIRO 1
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIROEXT
|
||||
*
|
||||
* Do we have the Cairo library available and want extended Cairo use in FLTK ?
|
||||
* This implies to link cairo.lib in all FLTK based apps.
|
||||
*/
|
||||
|
||||
#cmakedefine FLTK_HAVE_CAIROEXT 1
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_USE_X11
|
||||
*
|
||||
* Do we use X11 for the current platform?
|
||||
*
|
||||
*/
|
||||
|
||||
#cmakedefine FLTK_USE_X11 1
|
||||
53
fl_config.in
Normal file
53
fl_config.in
Normal file
@ -0,0 +1,53 @@
|
||||
/*
|
||||
* Build configuration file for the Fast Light Tool Kit (FLTK).
|
||||
*
|
||||
* Copyright 1998-2021 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
|
||||
*/
|
||||
|
||||
|
||||
/*
|
||||
* FL_ABI_VERSION (ABI version)
|
||||
*
|
||||
* define FL_ABI_VERSION: 1xxyy for 1.x.y (xx,yy with leading zero)
|
||||
*/
|
||||
|
||||
#undef FL_ABI_VERSION
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIRO
|
||||
*
|
||||
* Do we have the Cairo library available?
|
||||
*/
|
||||
|
||||
#undef FLTK_HAVE_CAIRO
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_HAVE_CAIROEXT
|
||||
*
|
||||
* Do we have the Cairo library available and want extended Cairo use in FLTK ?
|
||||
* This implies to link cairo.lib in all FLTK based apps.
|
||||
*/
|
||||
|
||||
#undef FLTK_HAVE_CAIROEXT
|
||||
|
||||
|
||||
/*
|
||||
* FLTK_USE_X11
|
||||
*
|
||||
* Do we use X11 for the current platform?
|
||||
*
|
||||
*/
|
||||
|
||||
#undef FLTK_USE_X11
|
||||
@ -107,6 +107,12 @@ else ()
|
||||
endif (APPLE AND (NOT OPTION_APPLE_X11) AND (NOT OPTION_APPLE_SDL))
|
||||
|
||||
target_link_libraries (fluid fltk fltk_images)
|
||||
|
||||
# we must link all programs with fltk_cairo if option CAIROEXT is enabled
|
||||
if (FLTK_HAVE_CAIROEXT)
|
||||
target_link_libraries (fluid fltk_cairo cairo)
|
||||
endif (FLTK_HAVE_CAIROEXT)
|
||||
|
||||
if (FLTK_HAVE_CAIRO)
|
||||
fl_target_link_directories (fluid PRIVATE "${PKG_CAIRO_LIBRARY_DIRS}")
|
||||
endif (FLTK_HAVE_CAIRO)
|
||||
|
||||
@ -1,13 +1,14 @@
|
||||
# DO NOT DELETE THIS LINE -- make depend depends on it.
|
||||
|
||||
about_panel.o: ../config.h
|
||||
about_panel.o: ../FL/abi-version.h
|
||||
about_panel.o: ../FL/Enumerations.H
|
||||
about_panel.o: ../FL/Fl.H
|
||||
about_panel.o: ../FL/Fl_Bitmap.H
|
||||
about_panel.o: ../FL/Fl_Box.H
|
||||
about_panel.o: ../FL/Fl_Button.H
|
||||
about_panel.o: ../FL/Fl_Cairo.H
|
||||
about_panel.o: ../FL/fl_casts.H
|
||||
about_panel.o: ../FL/fl_config.h
|
||||
about_panel.o: ../FL/Fl_Double_Window.H
|
||||
about_panel.o: ../FL/Fl_Export.H
|
||||
about_panel.o: ../FL/Fl_Group.H
|
||||
@ -21,7 +22,6 @@ about_panel.o: ../FL/Fl_Window.H
|
||||
about_panel.o: ../FL/platform_types.h
|
||||
about_panel.o: ../src/flstring.h
|
||||
about_panel.o: about_panel.h
|
||||
alignment_panel.o: ../FL/abi-version.h
|
||||
alignment_panel.o: ../FL/Enumerations.H
|
||||
alignment_panel.o: ../FL/filename.H
|
||||
alignment_panel.o: ../FL/Fl.H
|
||||
@ -31,9 +31,11 @@ alignment_panel.o: ../FL/Fl_Bitmap.H
|
||||
alignment_panel.o: ../FL/Fl_Box.H
|
||||
alignment_panel.o: ../FL/Fl_Browser_.H
|
||||
alignment_panel.o: ../FL/Fl_Button.H
|
||||
alignment_panel.o: ../FL/Fl_Cairo.H
|
||||
alignment_panel.o: ../FL/fl_casts.H
|
||||
alignment_panel.o: ../FL/Fl_Check_Button.H
|
||||
alignment_panel.o: ../FL/Fl_Choice.H
|
||||
alignment_panel.o: ../FL/fl_config.h
|
||||
alignment_panel.o: ../FL/Fl_Device.H
|
||||
alignment_panel.o: ../FL/Fl_Double_Window.H
|
||||
alignment_panel.o: ../FL/fl_draw.H
|
||||
@ -74,12 +76,13 @@ alignment_panel.o: alignment_panel.h
|
||||
alignment_panel.o: fluid.h
|
||||
alignment_panel.o: shell_command.h
|
||||
alignment_panel.o: widget_browser.h
|
||||
align_widget.o: ../FL/abi-version.h
|
||||
align_widget.o: ../FL/Enumerations.H
|
||||
align_widget.o: ../FL/filename.H
|
||||
align_widget.o: ../FL/Fl.H
|
||||
align_widget.o: ../FL/Fl_Bitmap.H
|
||||
align_widget.o: ../FL/Fl_Cairo.H
|
||||
align_widget.o: ../FL/fl_casts.H
|
||||
align_widget.o: ../FL/fl_config.h
|
||||
align_widget.o: ../FL/Fl_Device.H
|
||||
align_widget.o: ../FL/fl_draw.H
|
||||
align_widget.o: ../FL/Fl_Export.H
|
||||
@ -107,7 +110,6 @@ align_widget.o: Fl_Type.h
|
||||
align_widget.o: Fl_Widget_Type.h
|
||||
align_widget.o: undo.h
|
||||
code.o: ../config.h
|
||||
code.o: ../FL/abi-version.h
|
||||
code.o: ../FL/Enumerations.H
|
||||
code.o: ../FL/filename.H
|
||||
code.o: ../FL/Fl.H
|
||||
@ -116,9 +118,11 @@ code.o: ../FL/Fl_Bitmap.H
|
||||
code.o: ../FL/Fl_Box.H
|
||||
code.o: ../FL/Fl_Browser_.H
|
||||
code.o: ../FL/Fl_Button.H
|
||||
code.o: ../FL/Fl_Cairo.H
|
||||
code.o: ../FL/fl_casts.H
|
||||
code.o: ../FL/Fl_Check_Button.H
|
||||
code.o: ../FL/Fl_Choice.H
|
||||
code.o: ../FL/fl_config.h
|
||||
code.o: ../FL/Fl_Device.H
|
||||
code.o: ../FL/Fl_Double_Window.H
|
||||
code.o: ../FL/fl_draw.H
|
||||
@ -173,11 +177,12 @@ code.o: Fl_Widget_Type.h
|
||||
code.o: Fl_Window_Type.h
|
||||
code.o: shell_command.h
|
||||
code.o: widget_browser.h
|
||||
CodeEditor.o: ../FL/abi-version.h
|
||||
CodeEditor.o: ../FL/Enumerations.H
|
||||
CodeEditor.o: ../FL/Fl.H
|
||||
CodeEditor.o: ../FL/Fl_Bitmap.H
|
||||
CodeEditor.o: ../FL/Fl_Cairo.H
|
||||
CodeEditor.o: ../FL/fl_casts.H
|
||||
CodeEditor.o: ../FL/fl_config.h
|
||||
CodeEditor.o: ../FL/Fl_Device.H
|
||||
CodeEditor.o: ../FL/fl_draw.H
|
||||
CodeEditor.o: ../FL/Fl_Export.H
|
||||
@ -201,13 +206,14 @@ CodeEditor.o: ../FL/Fl_Widget.H
|
||||
CodeEditor.o: ../FL/platform_types.h
|
||||
CodeEditor.o: CodeEditor.h
|
||||
CodeEditor.o: StyleParse.h
|
||||
ExternalCodeEditor_UNIX.o: ../FL/abi-version.h
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Enumerations.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/filename.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Fl.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/fl_ask.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/fl_attr.h
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Fl_Cairo.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/fl_casts.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/fl_config.h
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Fl_Export.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Fl_Menu_Item.H
|
||||
ExternalCodeEditor_UNIX.o: ../FL/Fl_Preferences.H
|
||||
@ -219,7 +225,6 @@ ExternalCodeEditor_UNIX.o: ../FL/platform_types.h
|
||||
ExternalCodeEditor_UNIX.o: ExternalCodeEditor_UNIX.h
|
||||
ExternalCodeEditor_UNIX.o: fluid.h
|
||||
factory.o: ../config.h
|
||||
factory.o: ../FL/abi-version.h
|
||||
factory.o: ../FL/Enumerations.H
|
||||
factory.o: ../FL/filename.H
|
||||
factory.o: ../FL/Fl.H
|
||||
@ -229,10 +234,12 @@ factory.o: ../FL/Fl_Box.H
|
||||
factory.o: ../FL/Fl_Browser.H
|
||||
factory.o: ../FL/Fl_Browser_.H
|
||||
factory.o: ../FL/Fl_Button.H
|
||||
factory.o: ../FL/Fl_Cairo.H
|
||||
factory.o: ../FL/fl_casts.H
|
||||
factory.o: ../FL/Fl_Check_Browser.H
|
||||
factory.o: ../FL/Fl_Check_Button.H
|
||||
factory.o: ../FL/Fl_Clock.H
|
||||
factory.o: ../FL/fl_config.h
|
||||
factory.o: ../FL/Fl_Counter.H
|
||||
factory.o: ../FL/Fl_Device.H
|
||||
factory.o: ../FL/Fl_Dial.H
|
||||
@ -290,7 +297,6 @@ factory.o: Fl_Window_Type.h
|
||||
factory.o: pixmaps.h
|
||||
factory.o: undo.h
|
||||
file.o: ../config.h
|
||||
file.o: ../FL/abi-version.h
|
||||
file.o: ../FL/Enumerations.H
|
||||
file.o: ../FL/filename.H
|
||||
file.o: ../FL/Fl.H
|
||||
@ -300,9 +306,11 @@ file.o: ../FL/Fl_Bitmap.H
|
||||
file.o: ../FL/Fl_Box.H
|
||||
file.o: ../FL/Fl_Browser_.H
|
||||
file.o: ../FL/Fl_Button.H
|
||||
file.o: ../FL/Fl_Cairo.H
|
||||
file.o: ../FL/fl_casts.H
|
||||
file.o: ../FL/Fl_Check_Button.H
|
||||
file.o: ../FL/Fl_Choice.H
|
||||
file.o: ../FL/fl_config.h
|
||||
file.o: ../FL/Fl_Device.H
|
||||
file.o: ../FL/Fl_Double_Window.H
|
||||
file.o: ../FL/fl_draw.H
|
||||
@ -358,7 +366,6 @@ file.o: Fl_Window_Type.h
|
||||
file.o: shell_command.h
|
||||
file.o: widget_browser.h
|
||||
fluid.o: ../config.h
|
||||
fluid.o: ../FL/abi-version.h
|
||||
fluid.o: ../FL/Enumerations.H
|
||||
fluid.o: ../FL/filename.H
|
||||
fluid.o: ../FL/Fl.H
|
||||
@ -369,9 +376,11 @@ fluid.o: ../FL/Fl_Box.H
|
||||
fluid.o: ../FL/Fl_Browser.H
|
||||
fluid.o: ../FL/Fl_Browser_.H
|
||||
fluid.o: ../FL/Fl_Button.H
|
||||
fluid.o: ../FL/Fl_Cairo.H
|
||||
fluid.o: ../FL/fl_casts.H
|
||||
fluid.o: ../FL/Fl_Check_Button.H
|
||||
fluid.o: ../FL/Fl_Choice.H
|
||||
fluid.o: ../FL/fl_config.h
|
||||
fluid.o: ../FL/Fl_Device.H
|
||||
fluid.o: ../FL/Fl_Double_Window.H
|
||||
fluid.o: ../FL/fl_draw.H
|
||||
@ -451,7 +460,6 @@ fluid.o: template_panel.h
|
||||
fluid.o: undo.h
|
||||
fluid.o: widget_browser.h
|
||||
Fluid_Image.o: ../config.h
|
||||
Fluid_Image.o: ../FL/abi-version.h
|
||||
Fluid_Image.o: ../FL/Enumerations.H
|
||||
Fluid_Image.o: ../FL/filename.H
|
||||
Fluid_Image.o: ../FL/Fl.H
|
||||
@ -462,9 +470,11 @@ Fluid_Image.o: ../FL/Fl_Box.H
|
||||
Fluid_Image.o: ../FL/Fl_Browser.H
|
||||
Fluid_Image.o: ../FL/Fl_Browser_.H
|
||||
Fluid_Image.o: ../FL/Fl_Button.H
|
||||
Fluid_Image.o: ../FL/Fl_Cairo.H
|
||||
Fluid_Image.o: ../FL/fl_casts.H
|
||||
Fluid_Image.o: ../FL/Fl_Check_Button.H
|
||||
Fluid_Image.o: ../FL/Fl_Choice.H
|
||||
Fluid_Image.o: ../FL/fl_config.h
|
||||
Fluid_Image.o: ../FL/Fl_Device.H
|
||||
Fluid_Image.o: ../FL/Fl_Double_Window.H
|
||||
Fluid_Image.o: ../FL/fl_draw.H
|
||||
@ -510,7 +520,6 @@ Fluid_Image.o: Fl_Type.h
|
||||
Fluid_Image.o: Fl_Widget_Type.h
|
||||
Fluid_Image.o: Fl_Window_Type.h
|
||||
Fl_Function_Type.o: ../config.h
|
||||
Fl_Function_Type.o: ../FL/abi-version.h
|
||||
Fl_Function_Type.o: ../FL/Enumerations.H
|
||||
Fl_Function_Type.o: ../FL/filename.H
|
||||
Fl_Function_Type.o: ../FL/Fl.H
|
||||
@ -521,9 +530,11 @@ Fl_Function_Type.o: ../FL/Fl_Box.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Browser.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Button.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Function_Type.o: ../FL/fl_casts.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Check_Button.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Choice.H
|
||||
Fl_Function_Type.o: ../FL/fl_config.h
|
||||
Fl_Function_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Function_Type.o: ../FL/Fl_Double_Window.H
|
||||
Fl_Function_Type.o: ../FL/fl_draw.H
|
||||
@ -583,7 +594,6 @@ Fl_Function_Type.o: function_panel.h
|
||||
Fl_Function_Type.o: StyleParse.h
|
||||
Fl_Function_Type.o: widget_browser.h
|
||||
Fl_Group_Type.o: ../config.h
|
||||
Fl_Group_Type.o: ../FL/abi-version.h
|
||||
Fl_Group_Type.o: ../FL/Enumerations.H
|
||||
Fl_Group_Type.o: ../FL/filename.H
|
||||
Fl_Group_Type.o: ../FL/Fl.H
|
||||
@ -591,7 +601,9 @@ Fl_Group_Type.o: ../FL/fl_ask.H
|
||||
Fl_Group_Type.o: ../FL/fl_attr.h
|
||||
Fl_Group_Type.o: ../FL/Fl_Bitmap.H
|
||||
Fl_Group_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Group_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Group_Type.o: ../FL/fl_casts.H
|
||||
Fl_Group_Type.o: ../FL/fl_config.h
|
||||
Fl_Group_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Group_Type.o: ../FL/fl_draw.H
|
||||
Fl_Group_Type.o: ../FL/Fl_Export.H
|
||||
@ -627,7 +639,6 @@ Fl_Group_Type.o: Fl_Type.h
|
||||
Fl_Group_Type.o: Fl_Widget_Type.h
|
||||
Fl_Group_Type.o: widget_browser.h
|
||||
Fl_Menu_Type.o: ../config.h
|
||||
Fl_Menu_Type.o: ../FL/abi-version.h
|
||||
Fl_Menu_Type.o: ../FL/Enumerations.H
|
||||
Fl_Menu_Type.o: ../FL/filename.H
|
||||
Fl_Menu_Type.o: ../FL/Fl.H
|
||||
@ -637,9 +648,11 @@ Fl_Menu_Type.o: ../FL/Fl_Bitmap.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Box.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Button.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Menu_Type.o: ../FL/fl_casts.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Check_Button.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Choice.H
|
||||
Fl_Menu_Type.o: ../FL/fl_config.h
|
||||
Fl_Menu_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Menu_Type.o: ../FL/Fl_Double_Window.H
|
||||
Fl_Menu_Type.o: ../FL/fl_draw.H
|
||||
@ -697,14 +710,15 @@ Fl_Menu_Type.o: shell_command.h
|
||||
Fl_Menu_Type.o: Shortcut_Button.h
|
||||
Fl_Menu_Type.o: widget_browser.h
|
||||
Fl_Type.o: ../config.h
|
||||
Fl_Type.o: ../FL/abi-version.h
|
||||
Fl_Type.o: ../FL/Enumerations.H
|
||||
Fl_Type.o: ../FL/filename.H
|
||||
Fl_Type.o: ../FL/Fl.H
|
||||
Fl_Type.o: ../FL/fl_attr.h
|
||||
Fl_Type.o: ../FL/Fl_Bitmap.H
|
||||
Fl_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Type.o: ../FL/fl_casts.H
|
||||
Fl_Type.o: ../FL/fl_config.h
|
||||
Fl_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Type.o: ../FL/fl_draw.H
|
||||
Fl_Type.o: ../FL/Fl_Export.H
|
||||
@ -745,7 +759,6 @@ Fl_Type.o: shell_command.h
|
||||
Fl_Type.o: undo.h
|
||||
Fl_Type.o: widget_browser.h
|
||||
Fl_Widget_Type.o: ../config.h
|
||||
Fl_Widget_Type.o: ../FL/abi-version.h
|
||||
Fl_Widget_Type.o: ../FL/Enumerations.H
|
||||
Fl_Widget_Type.o: ../FL/filename.H
|
||||
Fl_Widget_Type.o: ../FL/Fl.H
|
||||
@ -755,9 +768,11 @@ Fl_Widget_Type.o: ../FL/Fl_Bitmap.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Box.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Button.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Widget_Type.o: ../FL/fl_casts.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Check_Button.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Choice.H
|
||||
Fl_Widget_Type.o: ../FL/fl_config.h
|
||||
Fl_Widget_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Widget_Type.o: ../FL/Fl_Double_Window.H
|
||||
Fl_Widget_Type.o: ../FL/fl_draw.H
|
||||
@ -828,7 +843,6 @@ Fl_Widget_Type.o: StyleParse.h
|
||||
Fl_Widget_Type.o: widget_browser.h
|
||||
Fl_Widget_Type.o: widget_panel.h
|
||||
Fl_Window_Type.o: ../config.h
|
||||
Fl_Window_Type.o: ../FL/abi-version.h
|
||||
Fl_Window_Type.o: ../FL/Enumerations.H
|
||||
Fl_Window_Type.o: ../FL/filename.H
|
||||
Fl_Window_Type.o: ../FL/Fl.H
|
||||
@ -838,9 +852,11 @@ Fl_Window_Type.o: ../FL/Fl_Bitmap.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Box.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Browser_.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Button.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Cairo.H
|
||||
Fl_Window_Type.o: ../FL/fl_casts.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Check_Button.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Choice.H
|
||||
Fl_Window_Type.o: ../FL/fl_config.h
|
||||
Fl_Window_Type.o: ../FL/Fl_Device.H
|
||||
Fl_Window_Type.o: ../FL/Fl_Double_Window.H
|
||||
Fl_Window_Type.o: ../FL/fl_draw.H
|
||||
@ -899,7 +915,6 @@ Fl_Window_Type.o: StyleParse.h
|
||||
Fl_Window_Type.o: undo.h
|
||||
Fl_Window_Type.o: widget_browser.h
|
||||
Fl_Window_Type.o: widget_panel.h
|
||||
function_panel.o: ../FL/abi-version.h
|
||||
function_panel.o: ../FL/Enumerations.H
|
||||
function_panel.o: ../FL/filename.H
|
||||
function_panel.o: ../FL/Fl.H
|
||||
@ -907,9 +922,11 @@ function_panel.o: ../FL/Fl_Bitmap.H
|
||||
function_panel.o: ../FL/Fl_Box.H
|
||||
function_panel.o: ../FL/Fl_Browser_.H
|
||||
function_panel.o: ../FL/Fl_Button.H
|
||||
function_panel.o: ../FL/Fl_Cairo.H
|
||||
function_panel.o: ../FL/fl_casts.H
|
||||
function_panel.o: ../FL/Fl_Check_Button.H
|
||||
function_panel.o: ../FL/Fl_Choice.H
|
||||
function_panel.o: ../FL/fl_config.h
|
||||
function_panel.o: ../FL/Fl_Device.H
|
||||
function_panel.o: ../FL/Fl_Double_Window.H
|
||||
function_panel.o: ../FL/fl_draw.H
|
||||
@ -1012,7 +1029,6 @@ pixmaps.o: pixmaps/flWizard.xpm
|
||||
pixmaps.o: pixmaps/invisible.xpm
|
||||
pixmaps.o: pixmaps/lock.xpm
|
||||
pixmaps.o: pixmaps/protected.xpm
|
||||
shell_command.o: ../FL/abi-version.h
|
||||
shell_command.o: ../FL/Enumerations.H
|
||||
shell_command.o: ../FL/filename.H
|
||||
shell_command.o: ../FL/Fl.H
|
||||
@ -1022,9 +1038,11 @@ shell_command.o: ../FL/Fl_Bitmap.H
|
||||
shell_command.o: ../FL/Fl_Box.H
|
||||
shell_command.o: ../FL/Fl_Browser_.H
|
||||
shell_command.o: ../FL/Fl_Button.H
|
||||
shell_command.o: ../FL/Fl_Cairo.H
|
||||
shell_command.o: ../FL/fl_casts.H
|
||||
shell_command.o: ../FL/Fl_Check_Button.H
|
||||
shell_command.o: ../FL/Fl_Choice.H
|
||||
shell_command.o: ../FL/fl_config.h
|
||||
shell_command.o: ../FL/Fl_Device.H
|
||||
shell_command.o: ../FL/Fl_Double_Window.H
|
||||
shell_command.o: ../FL/fl_draw.H
|
||||
@ -1068,7 +1086,6 @@ shell_command.o: fluid.h
|
||||
shell_command.o: shell_command.h
|
||||
shell_command.o: widget_browser.h
|
||||
Shortcut_Button.o: ../config.h
|
||||
Shortcut_Button.o: ../FL/abi-version.h
|
||||
Shortcut_Button.o: ../FL/Enumerations.H
|
||||
Shortcut_Button.o: ../FL/filename.H
|
||||
Shortcut_Button.o: ../FL/Fl.H
|
||||
@ -1076,8 +1093,10 @@ Shortcut_Button.o: ../FL/Fl_Bitmap.H
|
||||
Shortcut_Button.o: ../FL/Fl_Box.H
|
||||
Shortcut_Button.o: ../FL/Fl_Browser_.H
|
||||
Shortcut_Button.o: ../FL/Fl_Button.H
|
||||
Shortcut_Button.o: ../FL/Fl_Cairo.H
|
||||
Shortcut_Button.o: ../FL/fl_casts.H
|
||||
Shortcut_Button.o: ../FL/Fl_Choice.H
|
||||
Shortcut_Button.o: ../FL/fl_config.h
|
||||
Shortcut_Button.o: ../FL/Fl_Device.H
|
||||
Shortcut_Button.o: ../FL/Fl_Double_Window.H
|
||||
Shortcut_Button.o: ../FL/fl_draw.H
|
||||
@ -1124,7 +1143,6 @@ Shortcut_Button.o: widget_browser.h
|
||||
Shortcut_Button.o: widget_panel.h
|
||||
StyleParse.o: StyleParse.h
|
||||
template_panel.o: ../config.h
|
||||
template_panel.o: ../FL/abi-version.h
|
||||
template_panel.o: ../FL/Enumerations.H
|
||||
template_panel.o: ../FL/filename.H
|
||||
template_panel.o: ../FL/Fl.H
|
||||
@ -1135,7 +1153,9 @@ template_panel.o: ../FL/Fl_Box.H
|
||||
template_panel.o: ../FL/Fl_Browser.H
|
||||
template_panel.o: ../FL/Fl_Browser_.H
|
||||
template_panel.o: ../FL/Fl_Button.H
|
||||
template_panel.o: ../FL/Fl_Cairo.H
|
||||
template_panel.o: ../FL/fl_casts.H
|
||||
template_panel.o: ../FL/fl_config.h
|
||||
template_panel.o: ../FL/Fl_Double_Window.H
|
||||
template_panel.o: ../FL/Fl_Export.H
|
||||
template_panel.o: ../FL/Fl_Group.H
|
||||
@ -1157,14 +1177,15 @@ template_panel.o: ../src/flstring.h
|
||||
template_panel.o: fluid.h
|
||||
template_panel.o: template_panel.h
|
||||
undo.o: ../config.h
|
||||
undo.o: ../FL/abi-version.h
|
||||
undo.o: ../FL/Enumerations.H
|
||||
undo.o: ../FL/filename.H
|
||||
undo.o: ../FL/Fl.H
|
||||
undo.o: ../FL/fl_attr.h
|
||||
undo.o: ../FL/Fl_Bitmap.H
|
||||
undo.o: ../FL/Fl_Browser_.H
|
||||
undo.o: ../FL/Fl_Cairo.H
|
||||
undo.o: ../FL/fl_casts.H
|
||||
undo.o: ../FL/fl_config.h
|
||||
undo.o: ../FL/Fl_Device.H
|
||||
undo.o: ../FL/fl_draw.H
|
||||
undo.o: ../FL/Fl_Export.H
|
||||
@ -1191,13 +1212,14 @@ undo.o: fluid.h
|
||||
undo.o: Fl_Type.h
|
||||
undo.o: undo.h
|
||||
undo.o: widget_browser.h
|
||||
widget_browser.o: ../FL/abi-version.h
|
||||
widget_browser.o: ../FL/Enumerations.H
|
||||
widget_browser.o: ../FL/filename.H
|
||||
widget_browser.o: ../FL/Fl.H
|
||||
widget_browser.o: ../FL/Fl_Bitmap.H
|
||||
widget_browser.o: ../FL/Fl_Browser_.H
|
||||
widget_browser.o: ../FL/Fl_Cairo.H
|
||||
widget_browser.o: ../FL/fl_casts.H
|
||||
widget_browser.o: ../FL/fl_config.h
|
||||
widget_browser.o: ../FL/Fl_Device.H
|
||||
widget_browser.o: ../FL/fl_draw.H
|
||||
widget_browser.o: ../FL/Fl_Export.H
|
||||
@ -1221,14 +1243,15 @@ widget_browser.o: Fl_Type.h
|
||||
widget_browser.o: Fl_Widget_Type.h
|
||||
widget_browser.o: pixmaps.h
|
||||
widget_browser.o: widget_browser.h
|
||||
widget_panel.o: ../FL/abi-version.h
|
||||
widget_panel.o: ../FL/Enumerations.H
|
||||
widget_panel.o: ../FL/Fl.H
|
||||
widget_panel.o: ../FL/Fl_Bitmap.H
|
||||
widget_panel.o: ../FL/Fl_Box.H
|
||||
widget_panel.o: ../FL/Fl_Button.H
|
||||
widget_panel.o: ../FL/Fl_Cairo.H
|
||||
widget_panel.o: ../FL/fl_casts.H
|
||||
widget_panel.o: ../FL/Fl_Choice.H
|
||||
widget_panel.o: ../FL/fl_config.h
|
||||
widget_panel.o: ../FL/Fl_Device.H
|
||||
widget_panel.o: ../FL/Fl_Double_Window.H
|
||||
widget_panel.o: ../FL/fl_draw.H
|
||||
|
||||
@ -172,13 +172,13 @@ file (GLOB
|
||||
|
||||
# add generated header files in build directory
|
||||
list (APPEND HEADER_FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../FL/abi-version.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../FL/fl_config.h
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../config.h
|
||||
)
|
||||
|
||||
set (GL_HEADER_FILES) # FIXME: not (yet?) defined
|
||||
|
||||
if ((USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
|
||||
if ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
|
||||
set (PSFILES
|
||||
)
|
||||
else ()
|
||||
@ -186,11 +186,11 @@ else ()
|
||||
drivers/PostScript/Fl_PostScript.cxx
|
||||
drivers/PostScript/Fl_PostScript_image.cxx
|
||||
)
|
||||
endif ((USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
|
||||
endif ((FLTK_USE_X11 OR USE_SDL) AND NOT OPTION_PRINT_SUPPORT)
|
||||
|
||||
set (DRIVER_FILES)
|
||||
|
||||
if (USE_X11)
|
||||
if (FLTK_USE_X11)
|
||||
|
||||
# X11 (including APPLE with X11)
|
||||
|
||||
@ -362,7 +362,7 @@ else ()
|
||||
drivers/GDI/Fl_Font.H
|
||||
)
|
||||
|
||||
endif (USE_X11)
|
||||
endif (FLTK_USE_X11)
|
||||
|
||||
source_group("Header Files" FILES ${HEADER_FILES})
|
||||
source_group("Driver Source Files" FILES ${DRIVER_FILES})
|
||||
@ -408,13 +408,13 @@ set (GL_DRIVER_FILES
|
||||
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_rect.cxx
|
||||
drivers/OpenGL/Fl_OpenGL_Graphics_Driver_vertex.cxx
|
||||
)
|
||||
if (USE_X11)
|
||||
if (FLTK_USE_X11)
|
||||
set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/X11/Fl_X11_Gl_Window_Driver.cxx)
|
||||
elseif (APPLE)
|
||||
set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/Cocoa/Fl_Cocoa_Gl_Window_Driver.cxx)
|
||||
elseif (WIN32)
|
||||
set (GL_DRIVER_FILES ${GL_DRIVER_FILES} drivers/WinAPI/Fl_WinAPI_Gl_Window_Driver.cxx)
|
||||
endif (USE_X11)
|
||||
endif (FLTK_USE_X11)
|
||||
|
||||
set (GL_DRIVER_HEADER_FILES
|
||||
drivers/OpenGL/Fl_OpenGL_Display_Device.H
|
||||
@ -453,7 +453,7 @@ set (CFILES
|
||||
xutf8/case.c
|
||||
)
|
||||
|
||||
if (USE_X11)
|
||||
if (FLTK_USE_X11)
|
||||
list (APPEND CFILES
|
||||
xutf8/keysym2Ucs.c
|
||||
scandir_posix.c
|
||||
@ -465,7 +465,7 @@ if (USE_X11)
|
||||
# xutf8/utf8Input.c # not used
|
||||
)
|
||||
endif (NOT USE_XFT)
|
||||
endif (USE_X11)
|
||||
endif (FLTK_USE_X11)
|
||||
|
||||
if (WIN32)
|
||||
list (APPEND CFILES
|
||||
@ -515,9 +515,9 @@ if (USE_THREADS)
|
||||
list (APPEND OPTIONAL_LIBS ${CMAKE_THREAD_LIBS_INIT})
|
||||
endif (USE_THREADS)
|
||||
|
||||
if (USE_X11)
|
||||
if (FLTK_USE_X11)
|
||||
list (APPEND OPTIONAL_LIBS ${X11_LIBRARIES})
|
||||
endif (USE_X11)
|
||||
endif (FLTK_USE_X11)
|
||||
|
||||
if (USE_SDL)
|
||||
list (APPEND OPTIONAL_LIBS ${SDL2_LIBRARY})
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Window widget class for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2018 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -516,7 +516,7 @@ void Fl_Window::draw()
|
||||
|
||||
pWindowDriver->draw_end();
|
||||
if (!to_display) current_ = save_current;
|
||||
# if defined(FLTK_USE_CAIRO)
|
||||
# if defined(FLTK_HAVE_CAIROEXT)
|
||||
Fl::cairo_make_current(this); // checkout if an update is necessary
|
||||
# endif
|
||||
}
|
||||
|
||||
@ -3471,12 +3471,12 @@ void Fl_Cocoa_Window_Driver::make_current()
|
||||
}
|
||||
// this is the context with origin at top left of (sub)window
|
||||
CGContextSaveGState(gc);
|
||||
#if defined(FLTK_USE_CAIRO)
|
||||
#if defined(FLTK_HAVE_CAIROEXT)
|
||||
if (Fl::cairo_autolink_context()) Fl::cairo_make_current(pWindow); // capture gc changes automatically to update the cairo context adequately
|
||||
#endif
|
||||
fl_clip_region( 0 );
|
||||
|
||||
#if defined(FLTK_USE_CAIRO)
|
||||
#if defined(FLTK_HAVE_CAIROEXT)
|
||||
// update the cairo_t context
|
||||
if (Fl::cairo_autolink_context()) Fl::cairo_make_current(pWindow);
|
||||
#endif
|
||||
@ -3491,7 +3491,7 @@ void Fl_Cocoa_Window_Driver::q_release_context(Fl_Cocoa_Window_Driver *x) {
|
||||
CGContextRestoreGState(gc);
|
||||
CGContextFlush(gc);
|
||||
Fl_Graphics_Driver::default_driver().gc(0);
|
||||
#if defined(FLTK_USE_CAIRO)
|
||||
#if defined(FLTK_HAVE_CAIROEXT)
|
||||
if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
|
||||
#endif
|
||||
}
|
||||
|
||||
@ -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
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Definition of Android window driver.
|
||||
// Definition of Android window driver for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 2018-2020 by Bill Spitzak and others.
|
||||
// Copyright 2018-2021 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
|
||||
@ -667,7 +667,7 @@ void Fl_WinAPI_Window_Driver::hide() {
|
||||
fl_release_dc(fl_window, (HDC)fl_graphics_driver->gc());
|
||||
fl_window = (HWND)-1;
|
||||
fl_graphics_driver->gc(0);
|
||||
# ifdef FLTK_USE_CAIRO
|
||||
# ifdef FLTK_HAVE_CAIROEXT
|
||||
if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
|
||||
# endif
|
||||
}
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
//
|
||||
// Definition of Apple Cocoa window driver.
|
||||
// Definition of Windows window driver for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2021 by Bill Spitzak and others.
|
||||
//
|
||||
@ -16,8 +16,8 @@
|
||||
|
||||
|
||||
#include <config.h>
|
||||
#include <FL/fl_draw.H>
|
||||
#include <FL/Fl.H>
|
||||
#include <FL/fl_draw.H>
|
||||
#include <FL/Fl_Window.H>
|
||||
#include <FL/Fl_Image.H>
|
||||
#include <FL/Fl_Bitmap.H>
|
||||
@ -495,7 +495,7 @@ void Fl_WinAPI_Window_Driver::hide() {
|
||||
fl_release_dc(fl_window, (HDC)fl_graphics_driver->gc());
|
||||
fl_window = (HWND)-1;
|
||||
fl_graphics_driver->gc(0);
|
||||
# ifdef FLTK_USE_CAIRO
|
||||
# ifdef FLTK_HAVE_CAIROEXT
|
||||
if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0);
|
||||
# endif
|
||||
}
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Overlay support for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2018 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -19,6 +19,7 @@
|
||||
// to erase the overlay before drawing anything that might intersect
|
||||
// it.
|
||||
|
||||
#include <FL/fl_config.h>
|
||||
#include <FL/platform.H>
|
||||
#include <FL/fl_draw.H>
|
||||
|
||||
@ -42,7 +43,7 @@ static int bgx, bgy, bgw, bgh;
|
||||
|
||||
static void draw_current_rect() {
|
||||
#ifdef USE_XOR
|
||||
# if defined(USE_X11)
|
||||
# if defined(FLTK_USE_X11)
|
||||
GC gc = (GC)fl_graphics_driver->gc();
|
||||
XSetFunction(fl_display, gc, GXxor);
|
||||
XSetForeground(fl_display, gc, 0xffffffff);
|
||||
|
||||
578
src/makedepend
578
src/makedepend
File diff suppressed because it is too large
Load Diff
@ -31,7 +31,7 @@
|
||||
*/
|
||||
|
||||
#include <config.h>
|
||||
#if defined(USE_X11) && !defined(HAVE_SCANDIR)
|
||||
#if defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR)
|
||||
|
||||
#ifndef HAVE_PTHREAD
|
||||
/* Switch system headers into POSIX.1-1990 mode */
|
||||
@ -217,11 +217,11 @@ fl_scandir(const char *dir, struct dirent ***namelist,
|
||||
return result;
|
||||
}
|
||||
|
||||
#else /* defined(USE_X11) && !defined(HAVE_SCANDIR) */
|
||||
#else /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */
|
||||
|
||||
/* avoid (gcc) compiler warning [-Wpedantic]
|
||||
"ISO C forbids an empty translation unit" */
|
||||
|
||||
typedef int dummy;
|
||||
|
||||
#endif /* defined(USE_X11) && !defined(HAVE_SCANDIR) */
|
||||
#endif /* defined(FLTK_USE_X11) && !defined(HAVE_SCANDIR) */
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
/*
|
||||
* Author: Jean-Marc Lienher ( http://oksid.ch )
|
||||
* Copyright 2000-2003 by O'ksi'D.
|
||||
* Copyright 2004-2021 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
|
||||
@ -15,7 +16,7 @@
|
||||
|
||||
#include <config.h>
|
||||
|
||||
#if defined(USE_X11)
|
||||
#if defined(FLTK_USE_X11)
|
||||
|
||||
#include "../Xutf8.h"
|
||||
#include <X11/X.h>
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Cairo drawing test program for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2019 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -14,15 +14,16 @@
|
||||
// https://www.fltk.org/bugs.php
|
||||
//
|
||||
|
||||
#include <config.h>
|
||||
#include <FL/Fl.H> // includes <FL/fl_config.h>
|
||||
|
||||
#ifdef FLTK_HAVE_CAIRO
|
||||
#ifdef FLTK_HAVE_CAIRO // defined in <FL/fl_config.h> since FLTK 1.4.0
|
||||
|
||||
#include <FL/Fl_Cairo_Window.H>
|
||||
#include <FL/Fl_Box.H>
|
||||
#include <FL/platform.H>
|
||||
#include <FL/fl_draw.H>
|
||||
#include <FL/math.h>
|
||||
|
||||
#define DEF_WIDTH 0.03
|
||||
|
||||
// uncomment the following line to enable Cairo context autolink feature:
|
||||
@ -145,7 +146,9 @@ int main(int argc, char **argv) {
|
||||
|
||||
return Fl::run();
|
||||
}
|
||||
#else
|
||||
|
||||
#else // (!FLTK_HAVE_CAIRO)
|
||||
|
||||
#include <FL/fl_ask.H>
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
@ -155,4 +158,4 @@ int main(int argc, char **argv) {
|
||||
"or one of the CMake options OPTION_CAIRO or OPTION_CAIROEXT, respectively.");
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
#endif // (FLTK_HAVE_CAIRO)
|
||||
|
||||
@ -110,7 +110,7 @@ int main(int argc, char ** argv) {
|
||||
" - : default visual\n"
|
||||
" r : call Fl::visual(FL_RGB)\n"
|
||||
" c : call Fl::own_colormap()\n",argv[0]);
|
||||
#if USE_X11
|
||||
#ifdef FLTK_USE_X11
|
||||
printf(" # : use this visual with an empty colormap:\n");
|
||||
list_visuals();
|
||||
#endif
|
||||
@ -123,7 +123,7 @@ int main(int argc, char ** argv) {
|
||||
} else if (argv[i][0] == 'c') {
|
||||
Fl::own_colormap();
|
||||
} else if (argv[i][0] != '-') {
|
||||
#if USE_X11
|
||||
#ifdef FLTK_USE_X11
|
||||
int visid = atoi(argv[i]);
|
||||
fl_open_display();
|
||||
XVisualInfo templt; int num;
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
// as an icon or postage stamp. Use fl_draw_image to go directly
|
||||
// from an buffered image that changes often.
|
||||
//
|
||||
// Copyright 1998-2018 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -71,7 +71,7 @@ void button_cb(Fl_Widget *,void *) {
|
||||
}
|
||||
|
||||
#include <FL/platform.H>
|
||||
#if !defined(_WIN32) && !defined(__APPLE__) && !defined(__ANDROID__)
|
||||
#if defined(FLTK_USE_X11)
|
||||
#include "list_visuals.cxx"
|
||||
#endif
|
||||
|
||||
@ -87,7 +87,7 @@ int arg(int argc, char **argv, int &i) {
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
#if defined(USE_X11)
|
||||
#if defined(FLTK_USE_X11)
|
||||
int i = 1;
|
||||
|
||||
Fl::args(argc,argv,i,arg);
|
||||
|
||||
@ -9,7 +9,7 @@
|
||||
// This file may be #included in another program to make a function to
|
||||
// call to list the visuals. Fl.H must be included first to indicate this.
|
||||
//
|
||||
// Copyright 1998-2016 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -26,9 +26,9 @@
|
||||
# define NEED_MAIN 1 // when not included by another FLTK program
|
||||
#endif
|
||||
|
||||
#include <FL/platform.H> // for USE_X11
|
||||
#include <FL/platform.H> // for FLTK_USE_X11
|
||||
|
||||
#if USE_X11
|
||||
#ifdef FLTK_USE_X11
|
||||
|
||||
#include <config.h>
|
||||
|
||||
@ -188,16 +188,16 @@ void list_visuals() {
|
||||
if ( overlayInfo ) { XFree(overlayInfo); overlayInfo = 0; }
|
||||
}
|
||||
|
||||
#endif // USE_X11
|
||||
#endif // FLTK_USE_X11
|
||||
|
||||
#ifdef NEED_MAIN
|
||||
|
||||
# if ! USE_X11
|
||||
# ifndef FLTK_USE_X11
|
||||
# include <FL/fl_ask.H>
|
||||
# endif
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
# if USE_X11
|
||||
# ifdef FLTK_USE_X11
|
||||
if (argc == 1);
|
||||
else if (argc == 2 && argv[1][0]!='-') dname = argv[1];
|
||||
else {fprintf(stderr,"usage: %s <display>\n",argv[0]); exit(1);}
|
||||
@ -206,7 +206,7 @@ int main(int argc, char** argv) {
|
||||
# else
|
||||
fl_alert("Currently, this program works only under X.");
|
||||
return 1;
|
||||
# endif // USE_X11
|
||||
# endif // FLTK_USE_X11
|
||||
}
|
||||
|
||||
#endif // NEED_MAIN
|
||||
|
||||
269
test/makedepend
269
test/makedepend
File diff suppressed because it is too large
Load Diff
@ -2,6 +2,7 @@
|
||||
// Sudoku game using the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 2005-2018 by Michael Sweet.
|
||||
// Copyright 2019-2021 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
|
||||
@ -437,7 +438,7 @@ void SudokuSound::play(char note) {
|
||||
Sleep(NOTE_DURATION);
|
||||
} else Beep(frequencies[note - 'A'], NOTE_DURATION);
|
||||
|
||||
#elif USE_X11
|
||||
#elif defined(FLTK_USE_X11)
|
||||
# ifdef HAVE_ALSA_ASOUNDLIB_H
|
||||
if (handle) {
|
||||
// Use ALSA to play the sound...
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
//
|
||||
// Fl_Tiled_Image test program for the Fast Light Tool Kit (FLTK).
|
||||
//
|
||||
// Copyright 1998-2018 by Bill Spitzak and others.
|
||||
// Copyright 1998-2021 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
|
||||
@ -47,7 +47,7 @@ int arg(int argc, char **argv, int &i) {
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
#if USE_X11
|
||||
#ifdef FLTK_USE_X11
|
||||
int i = 1;
|
||||
|
||||
Fl::args(argc,argv,i,arg);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user