diff options
| author | Peter Foley <pefoley2@verizon.net> | 2012-10-05 19:03:06 -0400 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-10-07 10:42:29 +0200 |
| commit | d19932ac5795df8df46fdc6cc60153d4e6d6042e (patch) | |
| tree | 4a82eea4316d4a1e0c37d41bac8e4950f80a5f81 /libcdr | |
| parent | b23f3e484273ed44c36a0c039454cdfbf6f6f1e7 (diff) | |
fix libcdr with VS2012
Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77
Diffstat (limited to 'libcdr')
| -rw-r--r-- | libcdr/ExternalProject_libcdr.mk | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk index 933ce9722260..4982b8ca470a 100644 --- a/libcdr/ExternalProject_libcdr.mk +++ b/libcdr/ExternalProject_libcdr.mk @@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\ ifeq ($(OS)$(COM),WNTMSC) +ifeq ($(VCVER),90) $(call gb_ExternalProject_get_state_target,libcdr,build) : cd $(EXTERNAL_WORKDIR)/build/win32 \ && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ @@ -30,6 +31,25 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ && touch $@ +else ifeq ($(VCVER),100) +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && msbuild.exe libcdr.vcxproj /p:Configuration=Release \ + && touch $@ +else +$(call gb_ExternalProject_get_state_target,libcdr,build) : + cd $(EXTERNAL_WORKDIR)/build/win32 \ + && export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LIBWPG_INCLUDE_DIR=$(OUTDIR)/inc/external \ + && export LCMS2_INCLUDE_DIR=$(OUTDIR)/inc/lcms2 \ + && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \ + && msbuild.exe libcdr.vcxproj /p:PlatformToolset=v110 /p:Configuration=Release \ + && touch $@ +endif else |