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

link versioninfo resource to dlls

Browse Source
This commit is contained in:
Andras Timar
2012-01-06 23:17:43 +01:00
parent 47dd76d42b
commit c7c65bc0d7
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
solenv/gbuild/platform/WNT_INTEL_MSC.mk
View File

@@ -474,10 +474,10 @@ $(call gb_Library_get_clean_target,$(1)) : AUXTARGETS += \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.pdb,$(3))) \
$(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \ $(OUTDIR)/bin/$(notdir $(patsubst %.dll,%.ilk,$(3))) \
$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
endif endif
$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1)) $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
$(call gb_LinkTarget_get_target,$(2)) \ $(call gb_LinkTarget_get_target,$(2)) \
@@ -490,9 +490,13 @@ $(call gb_WinResTarget_WinResTarget_init,$(2))
$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo) $(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
$(call gb_WinResTarget_set_defs,$(2),\ $(call gb_WinResTarget_set_defs,$(2),\
$$(DEFS) \ $$(DEFS) \
-DADDITIONAL_VERINFO1 \ -DVERVARIANT="$(BUILD)" \
-DADDITIONAL_VERINFO2 \ -DRES_APP_VENDOR="$(OOO_VENDOR)" \
-DADDITIONAL_VERINFO3 \ -DORG_NAME="$(call gb_Library_get_dllname,$(1))"\
-DINTERNAL_NAME="$(subst $(gb_Library_DLLEXT),,$(call gb_Library_get_dllname,$(1)))" \
-DADDITIONAL_VERINFO1="" \
-DADDITIONAL_VERINFO2="" \
-DADDITIONAL_VERINFO3="" \
) )
$(call gb_Library_add_nativeres,$(1),$(2)) $(call gb_Library_add_nativeres,$(1),$(2))
$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2)) $(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))