diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2025-03-07 11:06:24 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2025-03-07 11:06:24 +0100 |
| commit | 7f60f019d77697c5e4e3a46f9571e1a25328b4b3 (patch) | |
| tree | a15af546ffa837e02e8f3e306c55e3fb427d6a5f /src/xutf8 | |
| parent | 6acda521ccaa448eeb26f81a2432da586bed9b30 (diff) | |
Fix "fltk autotools build does not link against libXft" (#1202)
libXft was erroneously present in the link command when using Pango and Cairo.
This is fixed by disconnecting the GUI scaling code from use of Xft.
This commit also makes sure that when Wayland is used, pkg-config is available
on the build machine. This allows to remove from file CMake/options.cmake
code that was labelled with "FIXME".
Diffstat (limited to 'src/xutf8')
| -rw-r--r-- | src/xutf8/lcUniConv/cp936ext.h | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/xutf8/lcUniConv/cp936ext.h b/src/xutf8/lcUniConv/cp936ext.h index a01df9641..1d72abb15 100644 --- a/src/xutf8/lcUniConv/cp936ext.h +++ b/src/xutf8/lcUniConv/cp936ext.h @@ -1,7 +1,7 @@ /* * Character encoding support for the Fast Light Tool Kit (FLTK). * - * Copyright 1998-2018 by Bill Spitzak and others. + * Copyright 1998-2025 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 @@ -13,12 +13,8 @@ * * https://www.fltk.org/bugs.php */ - -#if defined(_WIN32) || defined(__APPLE__) /* PORTME: is this really needed? It's huge! */ - - /* not needed */ - -#else +#include <FL/fl_config.h> +#if !defined(_WIN32) && (!defined(__APPLE__) || defined(FLTK_USE_X11)) #ifndef CP936 #ifdef NEED_TOWC @@ -38,7 +34,7 @@ cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) } #endif /* NEED_TOMB */ -#else +#else /* CP936 */ /* * CP936EXT */ @@ -6246,4 +6242,4 @@ cp936ext_wctomb (conv_t conv, unsigned char *r, ucs4_t wc, int n) #endif /* CP936 */ -#endif /* _WIN32 || __APPLE__ */ /* PORTME: Unicode stuff */ +#endif /* _WIN32 || __APPLE__ */ |