diff options
| author | Andras Timar <atimar@suse.com> | 2013-05-02 08:35:46 -0700 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-05-03 05:05:49 +0000 |
| commit | 940ecd8ab84429b4973a20e6990ed338d7d7a81e (patch) | |
| tree | 1f73cbc0c5022fe09925b1db25da131c49cacbf8 /extensions | |
| parent | 769b797884c8df5a13ee6a9290e621354ae4c49c (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
Reviewed-on: https://gerrit.libreoffice.org/3746
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
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: |