diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-25 14:59:57 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-03-25 14:59:57 +0100 |
| commit | b0de0123633df656f1eca0ee2ff71ebe6f900d68 (patch) | |
| tree | 0261a8ce2c5ecb2f276ef03b239f446b397aa03f | |
| parent | 00436cbc18dde46b81dd6b73224b489780918cae (diff) | |
vcl2gnumake: use gb_Library_get_runtime_filename instead of local workarounds
| -rwxr-xr-x | vcl/Library_vcl.mk | 4 | ||||
| -rwxr-xr-x | vcl/Library_vclplug_gen.mk | 2 |
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 \ )) |