diff options
| author | Andras Timar <atimar@suse.com> | 2013-05-02 08:35:46 -0700 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2013-05-02 18:58:36 +0200 |
| commit | ae3f7b70a84f330f76e2e60c4c6bc8c69dbf068f (patch) | |
| tree | 8168690a665de02d8381feef888bc4207854642d /solenv/gbuild/platform | |
| parent | 520fd4968d776218f69b76b6a31876c217fb491b (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.
Conflicts:
extensions/Library_npsoplugin.mk
extensions/WinResTarget_npsoplugin.mk
Change-Id: Ib91fa2a3b72b15912587f22becccb0aebc2aa390
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 29aa4af30bbe..77c2218e6e64 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -286,6 +286,12 @@ $(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 83d5d457427b..d101c653d7fc 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -357,6 +357,12 @@ $(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_ endef +define gb_LinkTarget_set_nativeres +$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2)) +$(call gb_LinkTarget_get_target,$(1)) : NATIVERES := $(call gb_WinResTarget_get_target,$(2)) + +endef + define gb_Library_get_dllname $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_DLLFILENAMES))) endef |