[Libreoffice-commits] .: Branch 'feature/gbuild_sdext' - 2 commits - RepositoryExternal.mk sdext/Library_pdfimport.mk

[David Tardon]

 RepositoryExternal.mk      |   27 +++++++++++++++++++++++----
 sdext/Library_pdfimport.mk |    5 +++--
 2 files changed, 26 insertions(+), 6 deletions(-)

New commits:
commit 09fae00a9b7dc8408ec0eba2a2c09ff66b860eeb
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 21 08:57:47 2012 +0100

    fix platform ID

diff --git a/sdext/Library_pdfimport.mk b/sdext/Library_pdfimport.mk
index 9f4528a..f59d988 100644
--- a/sdext/Library_pdfimport.mk
+++ b/sdext/Library_pdfimport.mk
@@ -32,10 +32,11 @@ $(eval $(call gb_Library_add_api,pdfimport,\
     udkapi \
 ))
 
-# FIXME: set PLATFORMID correctly
+include $(OUTDIR)/inc/rtlbootstrap.mk
+
 $(eval $(call gb_Library_add_defs,pdfimport,\
     -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
-    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(PLATFORMID)\" \
+    -DPDFI_IMPL_IDENTIFIER=\"com.sun.star.PDFImport-$(RTL_OS)-$(RTL_ARCH)\" \
 ))
 
 $(eval $(call gb_Library_add_package_headers,pdfimport,\
commit b2f603970a9916c232d6df640b75235fa4401ba1
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Feb 21 06:58:02 2012 +0100

    fix build with internal xpdf

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f39768e..577c570 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -1026,15 +1026,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