diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-05-17 16:39:25 +0200 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-12-01 12:44:20 +0100 |
| commit | 90243614b253bc2d6b3d12930f111eab5491316a (patch) | |
| tree | c05cdfa6fee9ff989bbd713ec9ca2fab96918e2c /config_host.mk.in | |
| parent | 301443e6bebd9c68a0229df832ddcb3188b575d3 (diff) | |
Distinguish between --disable-gui and --without-x
For the static WASM build, we need to build with GUI but without
X11, as this just includes a static Qt backend.
We already have USING_X11, which indicates that the platform will
use X11 as a backend, so we can match --without-x to USING_X11=no,
independent from the --disable-gui setting.
Fitting all this into vcl/Library_vcl.mk was originally getting
quite complex, but by moving the logic into configure.ac in a
previous commit, the branching becomes way easier.
Change-Id: Ia2ddba3400b4306b609a1f64823cca75061e0593
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116125
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'config_host.mk.in')
| -rw-r--r-- | config_host.mk.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index e17d3f73cf57..fc1a4b442e82 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -675,6 +675,7 @@ export TOUCH=@TOUCH@ export UCRTSDKDIR=@UCRTSDKDIR@ export UCRTVERSION=@UCRTVERSION@ export UCRT_REDISTDIR=@UCRT_REDISTDIR@ +export USE_HEADLESS_CODE=@USE_HEADLESS_CODE@ export USE_LD=@USE_LD@ export USE_LIBRARY_BIN_TAR=@USE_LIBRARY_BIN_TAR@ export USE_XINERAMA=@USE_XINERAMA@ |