drawinglayer/source/processor2d/cairopixelprocessor2d.cxx | 2 ++ drawinglayer/source/processor2d/processor2dtools.cxx | 4 ++-- vcl/Module_vcl.mk | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-)
New commits: commit c669f9ad8971128d00ab6f36f80a3bc69a9cc484 Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 10 18:46:33 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:33:53 2025 +0100 We do need salsrc.res also in the --enable-headless case Change-Id: I4e53550585a156bb0be09eaaa97ef29f90f9bba8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194578 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 2a9aa6e20753..ce176addf56b 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -140,9 +140,14 @@ $(eval $(call gb_Module_add_targets,vcl,\ )) endif -ifeq ($(OS)-$(USE_HEADLESS_CODE),WNT-) +ifeq ($(OS),WNT) $(eval $(call gb_Module_add_targets,vcl,\ WinResTarget_vcl \ +)) +endif + +ifeq ($(OS)-$(USE_HEADLESS_CODE),WNT-) +$(eval $(call gb_Module_add_targets,vcl,\ Library_vclplug_win \ )) endif commit 7e99f1cf1228bc7cdf5c3515ef3541212837502e Author: Tor Lillqvist <[email protected]> AuthorDate: Mon Mar 10 19:43:12 2025 +0200 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Dec 2 09:33:39 2025 +0100 Fix build on Windows with --enable-headless Squashed in: make compilerplugins/clang/checkconfigmacros.cxx happy Change-Id: I93c7eaf69b0911d589b539cb78a70a48d580d0f4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/194577 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Jenkins CollaboraOffice <[email protected]> diff --git a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx index 270843713def..9768fc7c669c 100644 --- a/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx +++ b/drawinglayer/source/processor2d/cairopixelprocessor2d.cxx @@ -61,7 +61,9 @@ #include <com/sun/star/awt/XView.hpp> #include <com/sun/star/awt/XControl.hpp> #include <unordered_map> +#ifndef _WIN32 #include <dlfcn.h> +#endif using namespace com::sun::star; diff --git a/drawinglayer/source/processor2d/processor2dtools.cxx b/drawinglayer/source/processor2d/processor2dtools.cxx index 6c38abc4039d..b37238e5aa7d 100644 --- a/drawinglayer/source/processor2d/processor2dtools.cxx +++ b/drawinglayer/source/processor2d/processor2dtools.cxx @@ -22,7 +22,7 @@ #include "vclmetafileprocessor2d.hxx" #include <config_vclplug.h> -#if defined(_WIN32) +#if defined(_WIN32) && !USE_HEADLESS_CODE #include <drawinglayer/processor2d/d2dpixelprocessor2d.hxx> #include <vcl/sysdata.hxx> #elif USE_HEADLESS_CODE @@ -78,7 +78,7 @@ std::unique_ptr<BaseProcessor2D> createPixelProcessor2DFromOutputDevice( OutputDevice& rTargetOutDev, const drawinglayer::geometry::ViewInformation2D& rViewInformation2D) { -#if defined(_WIN32) +#if defined(_WIN32) && !USE_HEADLESS_CODE // Windows: make dependent on TEST_SYSTEM_PRIMITIVE_RENDERER static bool bUsePrimitiveRenderer(nullptr != std::getenv("TEST_SYSTEM_PRIMITIVE_RENDERER"));
