diff options
| author | David Tardon <dtardon@redhat.com> | 2012-02-21 06:58:02 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-03-06 10:27:25 +0100 |
| commit | 548b61a2a022adb7ebf818410c088328b598a021 (patch) | |
| tree | d0a27b8f36a91ca18875d7f1b3b998947c7f0711 /RepositoryExternal.mk | |
| parent | 2db25c270e9d6bb052f6eef8864f8fdb1b9b3aee (diff) | |
fix build with internal xpdf
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index e369ff4cc5d6..1a054c742223 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1080,15 +1080,34 @@ endef else # !SYSTEM_POPPLER -# FIXME: what are the libs created by xpdf? -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\ - poppler \ +$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\ + fofi \ + Goo \ + xpdf \ )) define gb_LinkTarget__use_poppler +$(call gb_LinkTarget_set_include,$(1),\ + -I$(OUTDIR)/inc/xpdf \ + $$(INCLUDE) \ +) + +$(call gb_LinkTarget_add_linked_static_libs,$(1),\ + fofi \ + Goo \ + xpdf \ +) + +ifeq ($(OS),MACOSX) $(call gb_LinkTarget_add_linked_libs,$(1),\ - poppler \ + objc \ ) +else ifeq ($(OS),WNT) +$(call gb_LinkTarget_add_linked_libs,$(1),\ + advapi32 \ + gdi32 \ +) +endif endef |