solenv/gbuild/platform/WNT_INTEL_MSC.mk | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
New commits:
commit 2a2f2d8a858872b857fd3d571596e9f04e08bb28
Author: Andras Timar <ati...@suse.com>
Date: Fri Jan 6 23:17:43 2012 +0100
link versioninfo resource to dlls
diff --git a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
index 5f8fb1c..11d2a1e 100644
--- a/solenv/gbuild/platform/WNT_INTEL_MSC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_MSC.mk
@@ -482,10 +482,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)) \
@@ -498,9 +498,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))
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
