diff options
| -rw-r--r-- | RepositoryExternal.mk | 17 | ||||
| -rw-r--r-- | libwpd/ExternalPackage_libwpd.mk | 2 |
2 files changed, 1 insertions, 18 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 1c030fd225d0..1f22af9ea7fb 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -1020,21 +1020,6 @@ endef else # !SYSTEM_LIBWPD -ifeq ($(OS)$(COM),WNTMSC) - -$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ - libwpd-0.9 \ -)) - -define gb_LinkTarget__use_wpd -$(call gb_LinkTarget_use_static_libraries,$(1),\ - libwpd-0.9 \ -) - -endef - -else # !WNTMSC - $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \ wpd-0.9 \ )) @@ -1046,8 +1031,6 @@ $(call gb_LinkTarget_use_static_libraries,$(1),\ endef -endif # WNTMSC - endif # SYSTEM_LIBWPD diff --git a/libwpd/ExternalPackage_libwpd.mk b/libwpd/ExternalPackage_libwpd.mk index 053e107a134e..34622fbb500f 100644 --- a/libwpd/ExternalPackage_libwpd.mk +++ b/libwpd/ExternalPackage_libwpd.mk @@ -31,7 +31,7 @@ $(eval $(call gb_Package_Package,libwpd,$(call gb_UnpackedTarball_get_dir,wpd))) $(eval $(call gb_Package_use_external_project,libwpd,libwpd)) ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib)) +$(eval $(call gb_ExternalPackage_add_file,libwpd,lib/wpd-0.9.lib,build/win32/Release/lib/libwpd-0.9.lib)) else $(eval $(call gb_ExternalPackage_add_file,libwpd,lib/libwpd-0.9.a,src/lib/.libs/libwpd-0.9.a)) endif |