diff options
| author | Andras Timar <atimar@suse.com> | 2012-01-06 23:17:43 +0100 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-01-06 23:19:53 +0100 |
| commit | c7c65bc0d746b7fa6f63d7e76dc22202e689db09 (patch) | |
| tree | aae4fde429bd8e0b0037489c7421bd3c90e02f76 /solenv | |
| parent | 47dd76d42be8de592597a5206bd2e5c7b54a7536 (diff) | |
link versioninfo resource to dlls
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_MSC.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk b/solenv/gbuild/platform/WNT_INTEL_MSC.mk index 318e0d2c580f..284572ac73ca 100644 --- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk @@ -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)) |