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 /solenv | |
| 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 'solenv')
| -rw-r--r-- | solenv/gbuild/Library.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 6 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 6 |
3 files changed, 13 insertions, 0 deletions
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk index bb799114901c..6c9e96ed16a1 100644 --- a/solenv/gbuild/Library.mk +++ b/solenv/gbuild/Library.mk @@ -225,6 +225,7 @@ $(eval $(foreach method,\ add_sdi_headers \ export_objects_list \ add_nativeres \ + set_nativeres \ set_visibility_default \ set_warnings_not_errors \ set_generated_cxx_suffix \ diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index b9edab02d354..3f01233c6987 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -293,6 +293,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 72d63afcf4ad..c965f2b9fad2 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -283,6 +283,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 |