[Libreoffice-commits] core.git: libvisio/ExternalPackage_libvisio.mk libvisio/ExternalProject_libvisio.mk

[Peter Foley]

 libvisio/ExternalPackage_libvisio.mk |    4 +--
 libvisio/ExternalProject_libvisio.mk |   40 +----------------------------------
 2 files changed, 4 insertions(+), 40 deletions(-)

New commits:
commit e6a877f8fb8bd0410431ea15891cc09748bd6a3a
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Tue Mar 12 20:04:14 2013 -0400

    move libvisio to gcc-wrapper
    
    Change-Id: Ia2efaa7d58fa2040f597e6a303a219892a710c1f
    Reviewed-on: https://gerrit.libreoffice.org/2716
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

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_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
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_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: