diff options
author | Andras Timar <atimar@suse.com> | 2013-05-02 08:35:46 -0700 |
---|---|---|
committer | Andras Timar <atimar@suse.com> | 2013-05-02 08:43:23 -0700 |
commit | 874d91d6fc22ab527a98a837b48b0232306ace60 (patch) | |
tree | 001ebdaa0236d56853f51878f321642a2ef202f8 /extensions | |
parent | d2a2568747964858cf0fe867a3fe1bae14ad37ff (diff) |
fdo#54087 link the correct resource file to npsoplugin.dll
I had to add a new function to gbuild system: set_nativeres,
because the trick in extensions/Library_npsoplugin.mk did not work.
It linked the default.res, and that made the plugin unusable under
Windows. Also, one export was missing compared to LibreOffice 3.5.
Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/Library_npsoplugin.mk | 9 | ||||
-rw-r--r-- | extensions/WinResTarget_npsoplugin.mk | 4 |
2 files changed, 5 insertions, 8 deletions
diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk index 31908f607664..0ff92e55f18a 100644 --- a/extensions/Library_npsoplugin.mk +++ b/extensions/Library_npsoplugin.mk @@ -95,6 +95,8 @@ $(eval $(call gb_Library_add_defs,npsoplugin,\ ifeq ($(COM),MSC) $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_GetMIMEDescription \ + /EXPORT:NPP_Initialize \ + /EXPORT:NPP_Shutdown \ /EXPORT:NPP_New \ /EXPORT:NPP_Destroy \ /EXPORT:NPP_SetWindow \ @@ -105,7 +107,6 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\ /EXPORT:NPP_StreamAsFile \ /EXPORT:NPP_URLNotify \ /EXPORT:NPP_Print \ - /EXPORT:NPP_Shutdown \ /EXPORT:NP_GetEntryPoints \ /EXPORT:NP_Initialize \ /EXPORT:NP_Shutdown \ @@ -113,11 +114,7 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\ )) endif -# 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)) +$(eval $(call gb_Library_set_nativeres,npsoplugin,npsoplugin/npsoplugin)) endif # GUI=WNT diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk index d6b1e9570fd1..9db098444f2a 100644 --- a/extensions/WinResTarget_npsoplugin.mk +++ b/extensions/WinResTarget_npsoplugin.mk @@ -28,8 +28,8 @@ # instead of those above. # -$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res)) +$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin/npsoplugin)) -$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo)) +$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin/npsoplugin,extensions/source/nsplugin/source/nsplugin_oo)) # vim:set shiftwidth=4 softtabstop=4 expandtab: |