diff options
| -rw-r--r-- | basctl/Library_basctl.mk | 4 | ||||
| -rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
| -rw-r--r-- | vcl/source/window/builder.cxx | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk index 20e00351ef30..acd12b474160 100644 --- a/basctl/Library_basctl.mk +++ b/basctl/Library_basctl.mk @@ -29,10 +29,6 @@ $(eval $(call gb_Library_set_include,basctl,\ -I$(WORKDIR)/SdiTarget/basctl/sdi \ )) -$(eval $(call gb_Library_add_defs,basctl,\ - -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ -)) - $(eval $(call gb_Library_use_external,basctl,boost_headers)) $(eval $(call gb_Library_use_custom_headers,basctl,\ diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 25b2e7f66be1..50bdf3b3ca72 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -48,7 +48,6 @@ $(eval $(call gb_Library_add_defs,vcl,\ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,cui))\" \ -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,desktop_detector))\" \ -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,tk))\" \ - -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \ )) ifeq ($(SYSTEM_GLM),TRUE) diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 884a36474a5c..361953129edd 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -8,6 +8,7 @@ */ #include <config_feature_desktop.h> +#include <config_options.h> #include <memory> #include <unordered_map> |