sd/Library_sd.mk | 2 +- sw/Library_sw.mk | 2 +- toolkit/Library_tk.mk | 2 +- vcl/Library_vcl.mk | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit 97dae845c29fad0f02cedbf0f61a1dd2c722c5b0 Author: Matúš Kukan <[email protected]> Date: Mon Jun 16 10:30:32 2014 +0200 Use proper name also when libmerged is used. gb_Library__get_name was forgotten in 1817366cb5f61337b34b5284615d3d4e0a8aa68a Change-Id: I42592d70455b9c695879d7fa20881c77a1ca2066 diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index d1bb6eb..d6bb1be 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -49,7 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\ $(eval $(call gb_Library_add_defs,sd,\ -DSD_DLLIMPLEMENTATION \ - -DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,sdui)\" \ + -DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,sdui))\" \ )) ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),) diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index f2ff8aa..4732226 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -42,7 +42,7 @@ $(eval $(call gb_Library_use_sdk_api,sw)) $(eval $(call gb_Library_add_defs,sw,\ -DSW_DLLIMPLEMENTATION \ - -DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,swui)\" \ + -DSWUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,swui))\" \ )) $(eval $(call gb_Library_use_libraries,sw,\ diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index ddce52e..9c2410e 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Library_set_include,tk,\ $(eval $(call gb_Library_add_defs,tk,\ -DTOOLKIT_DLLIMPLEMENTATION \ - -DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,svt)\" \ + -DSVT_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,svt))\" \ )) $(eval $(call gb_Library_use_sdk_api,tk)) diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index e271b3e..e527508 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -45,9 +45,9 @@ $(eval $(call gb_Library_set_include,vcl,\ $(eval $(call gb_Library_add_defs,vcl,\ -DVCL_DLLIMPLEMENTATION \ - -DCUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,cui)\" \ - -DDESKTOP_DETECTOR_DLL_NAME=\"$(call gb_Library_get_runtime_filename,desktop_detector)\" \ - -DTK_DLL_NAME=\"$(call gb_Library_get_runtime_filename,tk)\" \ + -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))\" \ )) $(eval $(call gb_Library_use_sdk_api,vcl))
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
