diff options
| author | Peter Foley <pefoley2@verizon.net> | 2013-03-15 19:12:08 -0400 |
|---|---|---|
| committer | Peter Foley <pefoley2@verizon.net> | 2013-03-15 20:25:07 -0400 |
| commit | 7abc6baab1ce01011a0d3541c81216e2d6130ffa (patch) | |
| tree | 6570fe385dfe84b4f4390469464529995f4f8985 /libcdr | |
| parent | a2423c6822f6a099c9822996d92deceebe63cf6e (diff) | |
move libcdr to gcc-wrapper
Change-Id: Ic1e9c86e83f5896fdd90b3a66e392bfa2c4f77a6
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalPackage_libcdr.mk | 4 | ||||
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 43 |
2 files changed, 5 insertions, 42 deletions
diff --git a/libcdr/ExternalPackage_libcdr.mk b/libcdr/ExternalPackage_libcdr.mk index d032e8fa1b34..4f08279c754b 100644 --- a/libcdr/ExternalPackage_libcdr.mk +++ b/libcdr/ExternalPackage_libcdr.mk @@ -18,8 +18,8 @@ $(eval $(call gb_ExternalPackage_add_unpacked_files,libcdr,inc/external/libcdr,\ $(eval $(call gb_ExternalPackage_use_external_project,libcdr,libcdr)) -ifeq ($(OS)$(COM),WNTMSC) -$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,build/win32/Release/lib/libcdr-0.0.lib)) +ifeq ($(COM),MSC) +$(eval $(call gb_ExternalPackage_add_file,libcdr,lib/cdr-0.0.lib,src/lib/.libs/libcdr-0.0.lib)) else $(eval $(call gb_ExternalPackage_add_file,libcdr,lib/libcdr-0.0.a,src/lib/.libs/libcdr-0.0.a)) endif diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 431b9b497244..9da895bfc829 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -11,6 +11,8 @@ $(eval $(call gb_ExternalProject_ExternalProject,libcdr)) $(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr)) +$(eval $(call gb_ExternalProject_use_autoconf,libcdr,build)) + $(eval $(call gb_ExternalProject_register_targets,libcdr,\ build \ )) @@ -23,48 +25,11 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ zlib \ )) -ifeq ($(OS)$(COM),WNTMSC) - -ifeq ($(VCVER),90) -$(call gb_ExternalProject_get_state_target,libcdr,build) : - $(call gb_ExternalProject_run,build,\ - export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ - ,build/win32) -else ifeq ($(VCVER),100) -$(call gb_ExternalProject_get_state_target,libcdr,build) : - $(call gb_ExternalProject_run,build,\ - export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libcdr.vcxproj /p:Configuration=Release \ - ,build/win32) -else -$(call gb_ExternalProject_get_state_target,libcdr,build) : - $(call gb_ExternalProject_run,build,\ - export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && export LCMS2_INCLUDE_DIR=$(call gb_UnpackedTarball_get_dir,lcms2/include) \ - && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ - && export ICU_INCLUDE_DIR=$(OUTDIR)/inc/external \ - && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release \ - ,build/win32) -endif - -else - $(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_run,build,\ export PKG_CONFIG="" \ && export ICU_LIBS=" " \ - $(if $(filter NO,$(SYSTEM_ICU)),&& export ICU_CFLAGS="-I$(OUTDIR)/inc/external") \ - $(if $(filter YES,$(SYSTEM_ICU)),&& export ICU_CFLAGS=" ") \ + && export ICU_CFLAGS="$(if $(filter NO,$(SYSTEM_ICU)),-I$(OUTDIR)/inc/external)" \ && ./configure \ --with-pic \ --enable-static \ @@ -76,6 +41,4 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : && (cd $(EXTERNAL_WORKDIR)/src/lib && $(MAKE)) \ ) -endif - # vim: set noet sw=4 ts=4: |