diff options
author | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-07 09:36:11 +0200 |
---|---|---|
committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-03-07 09:36:40 +0200 |
commit | 9dacc3c6b626c4a2efd65bded0998b55f8b7aa28 (patch) | |
tree | 448c83261d915aacba94102242f89d28bc57e069 /extensions | |
parent | Pass parameters to cppunittester's lo_main() (diff) | |
download | core-9dacc3c6b626c4a2efd65bded0998b55f8b7aa28.tar.gz core-9dacc3c6b626c4a2efd65bded0998b55f8b7aa28.zip |
Use just one resource file for npsoplugin
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/Library_npsoplugin.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 3c6854692b23..2c5ad4f6c792 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 |