diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-03-25 13:13:53 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2021-04-09 12:22:01 +0200 |
| commit | d5aa0babdc8d0b1a56751ed16f436fd0b575ab37 (patch) | |
| tree | d7abe12b56f27d9478c2106a7c989a3abc55533c | |
| parent | Working static Writer (use SAL_VCL_QT5_USE_CAIRO) (diff) | |
| download | core-d5aa0babdc8d0b1a56751ed16f436fd0b575ab37.tar.gz core-d5aa0babdc8d0b1a56751ed16f436fd0b575ab37.zip | |
Hack Windows static build stuff
Change-Id: Ied05b72e95fceb47881f080d2b10eca29dfce73f
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2bf0c06806eb..8a6ff87bcb5f 100644 --- a/configure.ac +++ b/configure.ac @@ -3719,7 +3719,7 @@ fi if test "$_os" = "iOS" -o "$build_cpu" != "$host_cpu" -o -n "$DISABLE_DYNLOADING"; then # To allow building Windows multi-arch releases without cross-tooling - if test -z "$WIN_MULTI_ARCH" -a -z "$WIN_OTHER_ARCH"; then + if test -z "$WIN_MULTI_ARCH" -a -z "$WIN_OTHER_ARCH" -o -n "$DISABLE_DYNLOADING"; then cross_compiling="yes" fi fi @@ -5564,9 +5564,15 @@ if test "$USING_X11" != TRUE; then test_dbus=no build_gstreamer_1_0=no test_kf5=no - test_qt5=yes test_gtk3_kde5=no - enable_cairo_canvas=yes + if test "$DISABLE_DYNLOADING" = "TRUE" -a "$OS" != "WNT"; then + enable_cairo_canvas=yes + test_qt5=yes + enable_qt5=yes + else + enable_cairo_canvas=no + test_qt5=no + fi fi if test "$OS" = "EMSCRIPTEN"; then @@ -9445,7 +9451,11 @@ no|disable) # Python is required to build LibreOffice. In theory we could separate the build-time Python # requirement from the choice whether to include Python stuff in the installer, but why # bother? - AC_MSG_ERROR([Python is required at build time.]) + if test "$cross_compiling" = yes; then + enable_python=system + else + AC_MSG_ERROR([Python is required at build time.]) + fi fi enable_python=no AC_MSG_RESULT([none]) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b9ec2a9f6c5c..a69a090cb3fa 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -775,7 +775,7 @@ endif ifeq ($(OS),WNT) $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/opengl/win/WinDeviceInfo \ - vcl/source/app/salplug \ + $(if $(DISABLE_DYNLOADING),vcl/wasm/salplug,vcl/source/app/salplug) \ vcl/win/app/fileregistration \ )) |