[Libreoffice-commits] .: extensions/Library_npsoplugin.mk

[Tor Lillqvist]

 extensions/Library_npsoplugin.mk |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 9dacc3c6b626c4a2efd65bded0998b55f8b7aa28
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Wed Mar 7 09:36:11 2012 +0200

    Use just one resource file for npsoplugin

diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 3c68546..2c5ad4f 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -86,7 +86,11 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\
 	-DENGLISH \
 ))
 
-$(eval $(call gb_Library_add_nativeres,npsoplugin,npsoplugin_res))
+# Trick to get rid of the default.res to avoid duplicate VERSION
+# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res
+
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res))
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res))
 
 endif # GUI=WNT