build bundled libwpd and libwpg as shared libs

Change-Id: I7a00dfaa3252e2a0ab145ef8a4355f9bd14570da

RepositoryExternal.mk

@@ -2001,22 +2001,54 @@ gb_ExternalProject__use_wpd :=
 
 else # !SYSTEM_WPD
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+	wpd \
+))
+
+define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_set_include,$(1),\
+	$(WPD_CFLAGS) \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_use_libraries,$(1),\
+	wpd \
+)
+
+endef
+
+define gb_ExternalProject__use_wpd
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_Library_get_target,wpd)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+	libwpd \
+))
+
 define gb_LinkTarget__use_wpd
+$(call gb_LinkTarget_use_package,$(1),libwpd)
+
 $(call gb_LinkTarget_set_include,$(1),\
 	$(WPD_CFLAGS) \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libwpd)/src/lib/.libs/libwpd-0.10$(gb_StaticLibrary_PLAINEXT) \
+	$(WPD_LIBS) \
 )
-$(call gb_LinkTarget_use_external_project,$(1),libwpd)
 
 endef
+
 define gb_ExternalProject__use_wpd
-$(call gb_ExternalProject_use_external_project,$(1),libwpd)
+$(call gb_ExternalProject_use_package,$(1),libwpd)
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_WPD
 
 
@@ -2034,22 +2066,44 @@ gb_ExternalProject__use_wpg :=
 
 else # !SYSTEM_WPG
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+	wpg \
+))
+
 define gb_LinkTarget__use_wpg
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
 	$$(INCLUDE) \
 )
-$(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libwpg)/src/lib/.libs/libwpg-0.3$(gb_StaticLibrary_PLAINEXT) \
+$(call gb_LinkTarget_use_libraries,$(1),\
+	wpg \
 )
-$(call gb_LinkTarget_use_external_project,$(1),libwpg)
 
 endef
-define gb_ExternalProject__use_wpg
-$(call gb_ExternalProject_use_external_project,$(1),libwpg)
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo, \
+	libwpg \
+))
+
+define gb_LinkTarget__use_wpg
+$(call gb_LinkTarget_use_package,$(1),libwpg)
+
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
+	$$(INCLUDE) \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+	-L$(call gb_UnpackedTarball_get_dir,libwpg)/src/lib/.libs -lwpg-0.3 \
+)
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_WPG
 
 

configure.ac

@@ -7562,7 +7562,11 @@ AC_SUBST(ENABLE_CMIS)
 dnl ===================================================================
 dnl Check for system libwpd
 dnl ===================================================================
-libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs -lwpd-0.10"])
+AS_IF([test "$COM" = "MSC"],
+      [libwpd_libdir="${WORKDIR}/LinkTarget/Library"],
+      [libwpd_libdir="${WORKDIR}/UnpackedTarball/libwpd/src/lib/.libs"]
+)
+libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTarball/libwpd/inc"],["-L${libwpd_libdir} -lwpd-0.10"])
 
 dnl ===================================================================
 dnl Check for system lcms2

external/libwpd/ExternalPackage_libwpd.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpd,libwpd))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libwpd,libwpd))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.10.dylib,src/lib/.libs/libwpd-0.10.10.dylib))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.dll,src/lib/.libs/libwpd-0.10.dll))
+else ifeq ($(filter IOS ANDROID,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,libwpd,$(LIBO_LIB_FOLDER)/libwpd-0.10.so.10,src/lib/.libs/libwpd-0.10.so.10.0.0))
+endif
+
+# vim: set noet sw=4 ts=4:

external/libwpd/ExternalProject_libwpd.mk

@@ -24,8 +24,8 @@ $(call gb_ExternalProject_get_state_target,libwpd,build) :
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
 			--with-pic \
-			--enable-static \
-			--disable-shared \
+			--enable-shared \
+			--disable-static \
 			--without-docs \
 			--disable-tools \
 			--disable-debug \

external/libwpd/Library_wpd.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,wpd))
+
+$(eval $(call gb_Library_use_unpacked,wpd,libwpd))
+
+$(eval $(call gb_Library_use_externals,wpd,\
+	revenge \
+))
+
+$(eval $(call gb_Library_set_warnings_not_errors,wpd))
+
+$(eval $(call gb_Library_set_include,wpd,\
+    -I$(call gb_UnpackedTarball_get_dir,libwpd)/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,wpd,\
+	-DBOOST_ALL_NO_LIB \
+	-DDLL_EXPORT \
+	-DLIBWPD_BUILD \
+	-DNDEBUG \
+))
+
+$(eval $(call gb_Library_set_generated_cxx_suffix,wpd,cpp))
+
+$(eval $(call gb_Library_add_generated_exception_objects,wpd,\
+	UnpackedTarball/libwpd/src/lib/WP1BottomMarginGroup \
+	UnpackedTarball/libwpd/src/lib/WP1CenterTextGroup \
+	UnpackedTarball/libwpd/src/lib/WP1ContentListener \
+	UnpackedTarball/libwpd/src/lib/WP1ExtendedCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP1FileStructure \
+	UnpackedTarball/libwpd/src/lib/WP1FixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP1FlushRightGroup \
+	UnpackedTarball/libwpd/src/lib/WP1FontIdGroup \
+	UnpackedTarball/libwpd/src/lib/WP1FootnoteEndnoteGroup \
+	UnpackedTarball/libwpd/src/lib/WP1HeaderFooterGroup \
+	UnpackedTarball/libwpd/src/lib/WP1Heuristics \
+	UnpackedTarball/libwpd/src/lib/WP1JustificationGroup \
+	UnpackedTarball/libwpd/src/lib/WP1LeftIndentGroup \
+	UnpackedTarball/libwpd/src/lib/WP1LeftRightIndentGroup \
+	UnpackedTarball/libwpd/src/lib/WP1Listener \
+	UnpackedTarball/libwpd/src/lib/WP1MarginReleaseGroup \
+	UnpackedTarball/libwpd/src/lib/WP1MarginResetGroup \
+	UnpackedTarball/libwpd/src/lib/WP1Parser \
+	UnpackedTarball/libwpd/src/lib/WP1Part \
+	UnpackedTarball/libwpd/src/lib/WP1PictureGroup \
+	UnpackedTarball/libwpd/src/lib/WP1PointSizeGroup \
+	UnpackedTarball/libwpd/src/lib/WP1SetTabsGroup \
+	UnpackedTarball/libwpd/src/lib/WP1SpacingResetGroup \
+	UnpackedTarball/libwpd/src/lib/WP1StylesListener \
+	UnpackedTarball/libwpd/src/lib/WP1SubDocument \
+	UnpackedTarball/libwpd/src/lib/WP1SuppressPageCharacteristicsGroup \
+	UnpackedTarball/libwpd/src/lib/WP1TopMarginGroup \
+	UnpackedTarball/libwpd/src/lib/WP1UnsupportedFixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP1UnsupportedVariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP1VariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP3AttributeGroup \
+	UnpackedTarball/libwpd/src/lib/WP3ContentListener \
+	UnpackedTarball/libwpd/src/lib/WP3DefinitionGroup \
+	UnpackedTarball/libwpd/src/lib/WP3DisplayGroup \
+	UnpackedTarball/libwpd/src/lib/WP3DoubleByteScriptCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP3EndOfLinePageGroup \
+	UnpackedTarball/libwpd/src/lib/WP3ExtendedCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP3FileStructure \
+	UnpackedTarball/libwpd/src/lib/WP3FixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP3FontGroup \
+	UnpackedTarball/libwpd/src/lib/WP3FootnoteEndnoteGroup \
+	UnpackedTarball/libwpd/src/lib/WP3Header \
+	UnpackedTarball/libwpd/src/lib/WP3HeaderFooterGroup \
+	UnpackedTarball/libwpd/src/lib/WP3IndentGroup \
+	UnpackedTarball/libwpd/src/lib/WP3Listener \
+	UnpackedTarball/libwpd/src/lib/WP3MiscellaneousGroup \
+	UnpackedTarball/libwpd/src/lib/WP3PageFormatGroup \
+	UnpackedTarball/libwpd/src/lib/WP3Parser \
+	UnpackedTarball/libwpd/src/lib/WP3Part \
+	UnpackedTarball/libwpd/src/lib/WP3Resource \
+	UnpackedTarball/libwpd/src/lib/WP3ResourceFork \
+	UnpackedTarball/libwpd/src/lib/WP3SingleByteFunction \
+	UnpackedTarball/libwpd/src/lib/WP3StylesListener \
+	UnpackedTarball/libwpd/src/lib/WP3SubDocument \
+	UnpackedTarball/libwpd/src/lib/WP3TabGroup \
+	UnpackedTarball/libwpd/src/lib/WP3TablesGroup \
+	UnpackedTarball/libwpd/src/lib/WP3UndoGroup \
+	UnpackedTarball/libwpd/src/lib/WP3UnsupportedFixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP3UnsupportedVariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP3VariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP3WindowGroup \
+	UnpackedTarball/libwpd/src/lib/WP42ContentListener \
+	UnpackedTarball/libwpd/src/lib/WP42DefineColumnsGroup \
+	UnpackedTarball/libwpd/src/lib/WP42ExtendedCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP42FileStructure \
+	UnpackedTarball/libwpd/src/lib/WP42HeaderFooterGroup \
+	UnpackedTarball/libwpd/src/lib/WP42Heuristics \
+	UnpackedTarball/libwpd/src/lib/WP42Listener \
+	UnpackedTarball/libwpd/src/lib/WP42MarginResetGroup \
+	UnpackedTarball/libwpd/src/lib/WP42MultiByteFunctionGroup \
+	UnpackedTarball/libwpd/src/lib/WP42Parser \
+	UnpackedTarball/libwpd/src/lib/WP42Part \
+	UnpackedTarball/libwpd/src/lib/WP42StylesListener \
+	UnpackedTarball/libwpd/src/lib/WP42SubDocument \
+	UnpackedTarball/libwpd/src/lib/WP42SuppressPageCharacteristicsGroup \
+	UnpackedTarball/libwpd/src/lib/WP42UnsupportedMultiByteFunctionGroup \
+	UnpackedTarball/libwpd/src/lib/WP5AttributeGroup \
+	UnpackedTarball/libwpd/src/lib/WP5BoxGroup \
+	UnpackedTarball/libwpd/src/lib/WP5ContentListener \
+	UnpackedTarball/libwpd/src/lib/WP5DefinitionGroup \
+	UnpackedTarball/libwpd/src/lib/WP5ExtendedCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP5FileStructure \
+	UnpackedTarball/libwpd/src/lib/WP5FixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP5FontGroup \
+	UnpackedTarball/libwpd/src/lib/WP5FontNameStringPoolPacket \
+	UnpackedTarball/libwpd/src/lib/WP5FootnoteEndnoteGroup \
+	UnpackedTarball/libwpd/src/lib/WP5GeneralPacketData \
+	UnpackedTarball/libwpd/src/lib/WP5GeneralPacketIndex \
+	UnpackedTarball/libwpd/src/lib/WP5GraphicsInformationPacket \
+	UnpackedTarball/libwpd/src/lib/WP5Header \
+	UnpackedTarball/libwpd/src/lib/WP5HeaderFooterGroup \
+	UnpackedTarball/libwpd/src/lib/WP5IndentGroup \
+	UnpackedTarball/libwpd/src/lib/WP5ListFontsUsedPacket \
+	UnpackedTarball/libwpd/src/lib/WP5Listener \
+	UnpackedTarball/libwpd/src/lib/WP5PageFormatGroup \
+	UnpackedTarball/libwpd/src/lib/WP5Parser \
+	UnpackedTarball/libwpd/src/lib/WP5Part \
+	UnpackedTarball/libwpd/src/lib/WP5PrefixData \
+	UnpackedTarball/libwpd/src/lib/WP5SingleByteFunction \
+	UnpackedTarball/libwpd/src/lib/WP5SpecialHeaderIndex \
+	UnpackedTarball/libwpd/src/lib/WP5StylesListener \
+	UnpackedTarball/libwpd/src/lib/WP5SubDocument \
+	UnpackedTarball/libwpd/src/lib/WP5TabGroup \
+	UnpackedTarball/libwpd/src/lib/WP5TableEOLGroup \
+	UnpackedTarball/libwpd/src/lib/WP5TableEOPGroup \
+	UnpackedTarball/libwpd/src/lib/WP5UnsupportedFixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP5UnsupportedVariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP5VariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP60Header \
+	UnpackedTarball/libwpd/src/lib/WP61Header \
+	UnpackedTarball/libwpd/src/lib/WP6AttributeGroup \
+	UnpackedTarball/libwpd/src/lib/WP6BoxGroup \
+	UnpackedTarball/libwpd/src/lib/WP6CharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP6ColumnGroup \
+	UnpackedTarball/libwpd/src/lib/WP6CommentAnnotationPacket \
+	UnpackedTarball/libwpd/src/lib/WP6ContentListener \
+	UnpackedTarball/libwpd/src/lib/WP6DefaultInitialFontPacket \
+	UnpackedTarball/libwpd/src/lib/WP6DisplayNumberReferenceGroup \
+	UnpackedTarball/libwpd/src/lib/WP6EOLGroup \
+	UnpackedTarball/libwpd/src/lib/WP6ExtendedCharacterGroup \
+	UnpackedTarball/libwpd/src/lib/WP6ExtendedDocumentSummaryPacket \
+	UnpackedTarball/libwpd/src/lib/WP6FileStructure \
+	UnpackedTarball/libwpd/src/lib/WP6FillStylePacket \
+	UnpackedTarball/libwpd/src/lib/WP6FixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP6FontDescriptorPacket \
+	UnpackedTarball/libwpd/src/lib/WP6FootnoteEndnoteGroup \
+	UnpackedTarball/libwpd/src/lib/WP6GeneralTextPacket \
+	UnpackedTarball/libwpd/src/lib/WP6GraphicsBoxStylePacket \
+	UnpackedTarball/libwpd/src/lib/WP6GraphicsCachedFileDataPacket \
+	UnpackedTarball/libwpd/src/lib/WP6GraphicsFilenamePacket \
+	UnpackedTarball/libwpd/src/lib/WP6Header \
+	UnpackedTarball/libwpd/src/lib/WP6HeaderFooterGroup \
+	UnpackedTarball/libwpd/src/lib/WP6HighlightGroup \
+	UnpackedTarball/libwpd/src/lib/WP6Listener \
+	UnpackedTarball/libwpd/src/lib/WP6NumberingMethodGroup \
+	UnpackedTarball/libwpd/src/lib/WP6OutlineStylePacket \
+	UnpackedTarball/libwpd/src/lib/WP6PageGroup \
+	UnpackedTarball/libwpd/src/lib/WP6ParagraphGroup \
+	UnpackedTarball/libwpd/src/lib/WP6Parser \
+	UnpackedTarball/libwpd/src/lib/WP6Part \
+	UnpackedTarball/libwpd/src/lib/WP6PrefixData \
+	UnpackedTarball/libwpd/src/lib/WP6PrefixDataPacket \
+	UnpackedTarball/libwpd/src/lib/WP6PrefixIndice \
+	UnpackedTarball/libwpd/src/lib/WP6SetNumberGroup \
+	UnpackedTarball/libwpd/src/lib/WP6SingleByteFunction \
+	UnpackedTarball/libwpd/src/lib/WP6StyleGroup \
+	UnpackedTarball/libwpd/src/lib/WP6StylesListener \
+	UnpackedTarball/libwpd/src/lib/WP6SubDocument \
+	UnpackedTarball/libwpd/src/lib/WP6TabGroup \
+	UnpackedTarball/libwpd/src/lib/WP6TableStylePacket \
+	UnpackedTarball/libwpd/src/lib/WP6UndoGroup \
+	UnpackedTarball/libwpd/src/lib/WP6UnsupportedFixedLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP6UnsupportedVariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WP6VariableLengthGroup \
+	UnpackedTarball/libwpd/src/lib/WPDocument \
+	UnpackedTarball/libwpd/src/lib/WPXContentListener \
+	UnpackedTarball/libwpd/src/lib/WPXEncryption \
+	UnpackedTarball/libwpd/src/lib/WPXHeader \
+	UnpackedTarball/libwpd/src/lib/WPXListener \
+	UnpackedTarball/libwpd/src/lib/WPXMemoryStream \
+	UnpackedTarball/libwpd/src/lib/WPXPageSpan \
+	UnpackedTarball/libwpd/src/lib/WPXParser \
+	UnpackedTarball/libwpd/src/lib/WPXStylesListener \
+	UnpackedTarball/libwpd/src/lib/WPXSubDocument \
+	UnpackedTarball/libwpd/src/lib/WPXTable \
+	UnpackedTarball/libwpd/src/lib/libwpd_internal \
+	UnpackedTarball/libwpd/src/lib/libwpd_math \
+))
+
+# vim: set noet sw=4 ts=4:

external/libwpd/Module_libwpd.mk

@@ -10,8 +10,22 @@
 $(eval $(call gb_Module_Module,libwpd))
 
 $(eval $(call gb_Module_add_targets,libwpd,\
-	ExternalProject_libwpd \
 	UnpackedTarball_libwpd \
 ))
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Module_add_targets,libwpd,\
+	Library_wpd \
+))
+
+else
+
+$(eval $(call gb_Module_add_targets,libwpd,\
+	ExternalPackage_libwpd \
+	ExternalProject_libwpd \
+))
+
+endif
+
 # vim: set noet sw=4 ts=4:

external/libwpg/ExternalPackage_libwpg.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libwpg,libwpg))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libwpg,libwpg))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.3.dylib,src/lib/.libs/libwpg-0.3.3.dylib))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.dll,src/lib/.libs/libwpg-0.3.dll))
+else ifeq ($(filter IOS ANDROID,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,libwpg,$(LIBO_LIB_FOLDER)/libwpg-0.3.so.3,src/lib/.libs/libwpg-0.3.so.3.0.0))
+endif
+
+# vim: set noet sw=4 ts=4:

external/libwpg/ExternalProject_libwpg.mk

@@ -25,8 +25,8 @@ $(call gb_ExternalProject_get_state_target,libwpg,build) :
 		export PKG_CONFIG="" \
 		&& MAKE=$(MAKE) ./configure \
 			--with-pic \
-			--enable-static \
-			--disable-shared \
+			--enable-shared \
+			--disable-static \
 			--without-docs \
 			--disable-tools \
 			--disable-debug \

external/libwpg/Library_wpg.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,wpg))
+
+$(eval $(call gb_Library_use_unpacked,wpg,libwpg))
+
+$(eval $(call gb_Library_use_externals,wpg,\
+	revenge \
+	wpd \
+))
+
+$(eval $(call gb_Library_set_warnings_not_errors,wpg))
+
+$(eval $(call gb_Library_set_include,wpg,\
+    -I$(call gb_UnpackedTarball_get_dir,libwpg)/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,wpg,\
+	-DBOOST_ALL_NO_LIB \
+	-DDLL_EXPORT \
+	-DLIBWPG_BUILD \
+	-DNDEBUG \
+))
+
+$(eval $(call gb_Library_set_generated_cxx_suffix,wpg,cpp))
+
+$(eval $(call gb_Library_add_generated_exception_objects,wpg,\
+	UnpackedTarball/libwpg/src/lib/WPG1Parser \
+	UnpackedTarball/libwpg/src/lib/WPG2Parser \
+	UnpackedTarball/libwpg/src/lib/WPGBitmap \
+	UnpackedTarball/libwpg/src/lib/WPGColor \
+	UnpackedTarball/libwpg/src/lib/WPGDashArray \
+	UnpackedTarball/libwpg/src/lib/WPGHeader \
+	UnpackedTarball/libwpg/src/lib/WPGXParser \
+	UnpackedTarball/libwpg/src/lib/WPGraphics \
+))
+
+# vim: set noet sw=4 ts=4:

external/libwpg/Module_libwpg.mk

@@ -10,8 +10,22 @@
 $(eval $(call gb_Module_Module,libwpg))
 
 $(eval $(call gb_Module_add_targets,libwpg,\
-	ExternalProject_libwpg \
 	UnpackedTarball_libwpg \
 ))
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Module_add_targets,libwpg,\
+	Library_wpg \
+))
+
+else
+
+$(eval $(call gb_Module_add_targets,libwpg,\
+	ExternalPackage_libwpg \
+	ExternalProject_libwpg \
+))
+
+endif
+
 # vim: set noet sw=4 ts=4: