link versioninfo resource to dlls

This commit is contained in:
Andras Timar 2012-01-06 23:17:43 +01:00
parent 47dd76d42b
commit c7c65bc0d7

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,%.ilk,$(3))) \
$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
endif
$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
$(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
$(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_set_defs,$(2),\
$$(DEFS) \
-DADDITIONAL_VERINFO1 \
-DADDITIONAL_VERINFO2 \
-DADDITIONAL_VERINFO3 \
-DVERVARIANT="$(BUILD)" \
-DRES_APP_VENDOR="$(OOO_VENDOR)" \
-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_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))