3d1f28dd1f
The main idea was to move complexity from source (and Makefiles) into configure.ac, because otherwise these must replicate the "same" branching, often resulting in diversions. Better to keep the logic in one place (configure.ac) and set additional variables to be used directly by source code and Makefiles. Notably this introduce the "using_*" platform flags, which should be considered constants. There is USING_X11, which actually tells, if the build uses the platform's X11 (and I opted for the removal of HAVE_FEATURE_X11). I also consider variables constant, after they have been exported by AC_SUBST, which should never be conditional, or some AC_DEFINE set them for a config header. A large block of defaults depends on $using_x11, so we set them to the same value, but just if the platform doesn't set it. The other important flag is $using_freetype_fontconfig, if the platform uses freetype and fontconfig. The headless plugin uses cairo for its drawing operations and freetype+fontconfig for text, so $test_cairo = $using_freetype_fontconfig. This is independent from a the cairo canvas! The OpenGL X11 code now depends on USING_X11, but it doesn't yet reflect the filter in Library_vcl.mk protecting glx. I don't know how correct this glx filter is, seeing that the source code just checked for "UNX - some non-X11 targets". Change-Id: Id1ba1a967a5d8d10ee217458be879ed00459f7e6 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116440 Tested-by: Jenkins Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
32 lines
508 B
C
32 lines
508 B
C
/*
|
|
|
|
Settings about which desktops have support enabled.
|
|
|
|
*/
|
|
|
|
#ifndef CONFIG_VCLPLUG_H
|
|
#define CONFIG_VCLPLUG_H
|
|
|
|
/**
|
|
* Set, if the platform uses X11 code.
|
|
*/
|
|
#define USING_X11 0
|
|
|
|
/**
|
|
* Set the enabled platform plugins
|
|
*/
|
|
#define ENABLE_GTK3 0
|
|
#define ENABLE_GTK3_KDE5 0
|
|
#define ENABLE_HEADLESS 0
|
|
#define ENABLE_KF5 0
|
|
#define ENABLE_QT5 0
|
|
|
|
/**
|
|
* Additional settings for the plugins
|
|
*/
|
|
#define ENABLE_GSTREAMER_1_0 0
|
|
#define QT5_HAVE_GOBJECT 0
|
|
#define QT5_USING_X11 0
|
|
#define QT5_HAVE_XCB_ICCCM 0
|
|
|
|
#endif
|