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

RepositoryExternal.mk: fix poppler linking on Ubuntu

need to link poppler static library *before* jpeg

Change-Id: I0fd2abc12c93432715a02a3a567349abda4f990b
üst a30f9694
......@@ -2771,7 +2771,6 @@ endef
else # !SYSTEM_POPPLER
define gb_LinkTarget__use_poppler
$(call gb_LinkTarget_use_external,$(1),jpeg)
$(call gb_LinkTarget_use_external_project,$(1),poppler,full)
$(call gb_LinkTarget_set_include,$(1),\
......@@ -2787,6 +2786,8 @@ $(call gb_LinkTarget_add_libs,$(1),\
$(call gb_UnpackedTarball_get_dir,poppler)/poppler/.libs/libpoppler$(gb_StaticLibrary_PLAINEXT) \
)
$(call gb_LinkTarget_use_external,$(1),jpeg)
ifeq ($(OS),MACOSX)
$(call gb_LinkTarget_add_libs,$(1),\
-lobjc \
......
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