summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rwxr-xr-xvcl/Library_vcl.mk4
-rwxr-xr-xvcl/Library_vclplug_gen.mk2
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 1bfc629b7a04..abd3297879d9 100755
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -56,7 +56,7 @@ endif
$(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DVCL_DLLIMPLEMENTATION \
- -DCUI_DLL_NAME=\"$(or $(call gb_Library_get_dllname,cui),$(call gb_Library_get_filename,cui))\" \
+ -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \
-DDLLPOSTFIX=$(subst $(or $(gb_Library_DLLEXT),$(gb_Library_PLAINEXT)),,$(gb_Library_OOOEXT)) \
))
@@ -178,7 +178,7 @@ $(eval $(call gb_Library_set_defs,vcl,\
$$(DEFS) \
-DSAL_DLLPREFIX=\"$(gb_Library_SYSPRE)\" \
-DSAL_DLLPOSTFIX=\"$(gb_Library_OOOEXT)\" \
- -D_XSALSET_LIBNAME=\"$(call gb_Library_get_filename,spa)\" \
+ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
))
## handle fontconfig
ifneq ($(ENABLE_FONTCONFIG),)
diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index bba48e0d65ba..4d2ee7e91238 100755
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -113,7 +113,7 @@ $(eval $(call gb_Library_add_exception_objects,vclplug_gen,\
$(eval $(call gb_Library_set_defs,vclplug_gen,\
$$(DEFS) \
- -D_XSALSET_LIBNAME=\"$(gb_Library_SYSPRE)spa$(gb_Library_OOOEXT)\" \
+ -D_XSALSET_LIBNAME=\"$(call gb_Library_get_runtime_filename,spa)\" \
-DVCLPLUG_GEN_IMPLEMENTATION \
))