diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-12 20:04:14 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-12 20:04:14 -0400 |
| commit | 49426e5eae877f968261df495a16c1a608f7da43 (patch) | |
| tree | 9415a87ef88ec12609f2e841d095c05cb849ddfc | |
| parent | a54009336d286b0826ff12028735860076a2138b (diff) | |
move libvisio to gcc-wrapper
Change-Id: I530e005e6b4964182da10d1b240d56eef929713b
| -rw-r--r-- | libvisio/ExternalPackage_libvisio.mk | 4 | ||||
| -rw-r--r-- | libvisio/ExternalProject_libvisio.mk | 40 |
2 files changed, 4 insertions, 40 deletions
diff --git a/libvisio/ExternalPackage_libvisio.mk b/libvisio/ExternalPackage_libvisio.mk index 76d573afb6c8..5838a137554c 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 dcd61a1203e9..2095e614e4ef 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: |