Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2713
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/13/2713/1
move libvisio to gcc-wrapper
Change-Id: I530e005e6b4964182da10d1b240d56eef929713b
---
M libvisio/ExternalPackage_libvisio.mk
M libvisio/ExternalProject_libvisio.mk
2 files changed, 4 insertions(+), 40 deletions(-)
diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk
index 76d573a..5838a13 100644
--- a/libvisio/ExternalPackage_libvisio.mk
+++ b/libvisio/ExternalPackage_libvisio.mk
@@ -17,8 +17,8 @@
$(eval $(call gb_ExternalPackage_use_external_project,libvisio,libvisio))
-ifeq ($(OS)$(COM),WNTMSC)
-$(eval $(call
gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,build/win32/Release/lib/libvisio-0.0.lib))
+ifeq ($(COM),MSC)
+$(eval $(call
gb_ExternalPackage_add_file,libvisio,lib/visio-0.0.lib,src/lib/.libs/libvisio-0.0.lib))
else
$(eval $(call
gb_ExternalPackage_add_file,libvisio,lib/libvisio-0.0.a,src/lib/.libs/libvisio-0.0.a))
endif
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index dcd61a1..2095e61 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -11,6 +11,8 @@
$(eval $(call gb_ExternalProject_use_unpacked,libvisio,visio))
+$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
+
$(eval $(call gb_ExternalProject_register_targets,libvisio,\
build \
))
@@ -21,42 +23,6 @@
wpg \
libxml2 \
))
-
-ifeq ($(OS)$(COM),WNTMSC)
-
-ifeq ($(VCVER),90)
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && $(COMPATH)/vcpackages/vcbuild.exe libvisio.vcproj "Release|Win32" \
- ,build/win32)
-else ifeq ($(VCVER),100)
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libvisio.vcxproj /p:Configuration=Release \
- ,build/win32)
-else
-$(call gb_ExternalProject_get_state_target,libvisio,build) :
- $(call gb_ExternalProject_run,build,\
- export BOOST_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,boost) \
- && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \
- && export LIBXML_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,xml2)/include \
- && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
- && msbuild.exe libvisio.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0
/p:Configuration=Release \
- ,build/win32)
-endif
-
-else
$(call gb_ExternalProject_get_state_target,libvisio,build) :
$(call gb_ExternalProject_run,build,\
@@ -73,7 +39,5 @@
$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM)
--host=$(HOST_PLATFORM)) \
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
-
-endif
# vim: set noet sw=4 ts=4:
--
To view, visit https://gerrit.libreoffice.org/2713
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I530e005e6b4964182da10d1b240d56eef929713b
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: feature/gccwrapper
Gerrit-Owner: Peter Foley <pefoley2@verizon.net>
Context
- [PATCH feature/gccwrapper] move libvisio to gcc-wrapper · Peter Foley (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.