Kaydet (Commit) e6a877f8 authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) Fridrich Strba

move libvisio to gcc-wrapper

Change-Id: Ia2efaa7d58fa2040f597e6a303a219892a710c1f
Reviewed-on: https://gerrit.libreoffice.org/2716Reviewed-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
Tested-by: 's avatarFridrich Strba <fridrich@documentfoundation.org>
üst 357ace56
......@@ -17,8 +17,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libvisio,inc/external/libvis
$(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
......
......@@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libvisio))
$(eval $(call gb_ExternalProject_use_unpacked,libvisio,visio))
$(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
$(eval $(call gb_ExternalProject_register_targets,libvisio,\
build \
))
......@@ -22,42 +24,6 @@ $(eval $(call gb_ExternalProject_use_externals,libvisio,\
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,\
PKG_CONFIG="" \
......@@ -74,6 +40,4 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) :
&& (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \
)
endif
# vim: set noet sw=4 ts=4:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment