diff options
| author | Michael Stahl <mstahl@redhat.com> | 2012-06-25 12:27:04 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-06-25 12:46:17 +0200 |
| commit | f0de66d9a541505e14261ffac08e021bce6b67ba (patch) | |
| tree | 98cae733fd0b6787947e3beb9832c0e5ca5fcdf4 /solenv | |
| parent | 463e59d680467a7b0d30ae956935a444c513de9e (diff) | |
fdo#51115: fix sdext extensions on Windows:
The sdext extensions contain the .lib link stub instead of DLLs;
add gb_Extension_add_library to get the correct DLL filename on Windows,
and use it in presenter screen, presentation minimizer and
PDF import extensions.
Change-Id: Ie8113a6002f9038e4df798edc255208977ba9497
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/Extension.mk | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/solenv/gbuild/Extension.mk b/solenv/gbuild/Extension.mk index 583a9a77569f..a959a8f34eed 100644 --- a/solenv/gbuild/Extension.mk +++ b/solenv/gbuild/Extension.mk @@ -156,6 +156,16 @@ $(foreach file,$(3),$(call gb_Extension_add_file,$(1),$(if $(strip $(2)),$(strip endef +# add a library from the solver; DO NOT use gb_Library_get_target +define gb_Extension_add_library +$(call gb_Extension_add_file,$(1),$(call gb_Library_get_runtime_filename,$(2)),\ + $(gb_Helper_OUTDIRLIBDIR)/$(call gb_Library_get_runtime_filename,$(2))) +endef + +define gb_Extension_add_libraries +$(foreach lib,$(2),$(call gb_Extension_add_library,$(1),$(lib))) +endef + # localize .properties file # source file is copied to $(WORKDIR) define gb_Extension_localize_properties |