diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-15 19:45:24 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-15 20:25:10 -0400 |
| commit | d3f62f190e454946ec6be518f6a440bb39b8f584 (patch) | |
| tree | 2be1b1efd0e14720b7edf7a0a3e4f8041025bd85 /libmspub | |
| parent | ca05c3a209af742b3beae1029b1eb1c92cec2626 (diff) | |
move libmspub to gcc-wrapper
Change-Id: I44f1e53411e273575ebb97bf19c8a7a3ad2c313c
Diffstat (limited to 'libmspub')
| -rw-r--r-- | libmspub/ExternalPackage_libmspub.mk | 4 | ||||
| -rw-r--r-- | libmspub/ExternalProject_libmspub.mk | 40 |
2 files changed, 4 insertions, 40 deletions
diff --git a/libmspub/ExternalPackage_libmspub.mk b/libmspub/ExternalPackage_libmspub.mk index 83a0c87da148..3807c2b16064 100644 --- a/libmspub/ExternalPackage_libmspub.mk +++ b/libmspub/ExternalPackage_libmspub.mk @@ -17,8 +17,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libmspub,inc/external/libmsp $(eval $(call gb_ExternalPackage_use_external_project,libmspub,libmspub)) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,build/win32/Release/lib/libmspub-0.0.lib)) +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,libmspub,lib/mspub-0.0.lib,src/lib/.libs/libmspub-0.0.lib)) else $(eval $(call gb_ExternalPackage_add_file,libmspub,lib/libmspub-0.0.a,src/lib/.libs/libmspub-0.0.a)) endif diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk index 73ca1c6ab461..bd93b4000e2d 100644 --- a/libmspub/ExternalProject_libmspub.mk +++ b/libmspub/ExternalProject_libmspub.mk @@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libmspub)) $(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub)) +$(eval $(call gb_ExternalProject_use_autoconf,libmspub,build)) + $(eval $(call gb_ExternalProject_register_targets,libmspub,\ build \ )) @@ -22,42 +24,6 @@ $(eval $(call gb_ExternalProject_use_externals,libmspub,\ wpg \ )) -ifeq ($(OS)$(COM),WNTMSC) - -ifeq ($(VCVER),90) -$(call gb_ExternalProject_get_state_target,libmspub,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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && $(COMPATH)/vcpackages/vcbuild.exe libmspub.vcproj "Release|Win32" \ - ,build/win32) -else ifeq ($(VCVER),100) -$(call gb_ExternalProject_get_state_target,libmspub,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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libmspub.vcxproj /p:Configuration=Release \ - ,build/win32) -else -$(call gb_ExternalProject_get_state_target,libmspub,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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libmspub.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ - ,build/win32) -endif - -else - $(call gb_ExternalProject_get_state_target,libmspub,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ @@ -77,6 +43,4 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) -endif - # vim: set noet sw=4 ts=4: |