Kaydet (Commit) f0de66d9 authored tarafından Michael Stahl's avatar Michael Stahl

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
üst 463e59d6
......@@ -31,8 +31,8 @@ $(eval $(call gb_Extension_Extension,presentation-minimizer,sdext/source/minimiz
$(eval $(call gb_Extension_set_platform,presentation-minimizer,$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_files,presentation-minimizer,,\
$(call gb_Library_get_target,SunPresentationMinimizer) \
$(eval $(call gb_Extension_add_libraries,presentation-minimizer,\
SunPresentationMinimizer \
))
$(eval $(call gb_Extension_add_file,presentation-minimizer,components.rdb,$(call gb_Rdb_get_target,minimizer)))
......
......@@ -33,9 +33,12 @@ $(eval $(call gb_Extension_set_platform,pdfimport,$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_file,pdfimport,components.rdb,$(call gb_Rdb_get_target,pdfimport)))
$(eval $(call gb_Extension_add_libraries,pdfimport,\
pdfimport \
))
$(eval $(call gb_Extension_add_files,pdfimport,,\
$(call gb_Executable_get_target,xpdfimport) \
$(call gb_Library_get_target,pdfimport) \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_import_filter.xcu \
$(SRCDIR)/sdext/source/pdfimport/config/pdf_types.xcu \
$(SRCDIR)/sdext/source/pdfimport/dialogs/xpdfimport_err.pdf \
......
......@@ -31,8 +31,8 @@ $(eval $(call gb_Extension_Extension,presenter-screen,sdext/source/presenter))
$(eval $(call gb_Extension_set_platform,presenter-screen,$(sdext_PLATFORM)))
$(eval $(call gb_Extension_add_files,presenter-screen,,\
$(call gb_Library_get_target,PresenterScreen) \
$(eval $(call gb_Extension_add_libraries,presenter-screen,\
PresenterScreen \
))
$(eval $(call gb_Extension_add_file,presenter-screen,components.rdb,$(call gb_Rdb_get_target,presenter)))
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment