mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use proper name also when libmerged is used.

Browse Source 
gb_Library__get_name was forgotten in
1817366cb5

Change-Id: I42592d70455b9c695879d7fa20881c77a1ca2066
This commit is contained in:
Matúš Kukan
2014-06-16 10:30:32 +02:00
parent a41e5ef986
commit 97dae845c2
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sd/Library_sd.mk
View File

@@ -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)),)

2
sw/Library_sw.mk
View File

@@ -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,\

2
toolkit/Library_tk.mk
View File

@@ -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))

6
vcl/Library_vcl.mk
View File

@@ -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))