Skip to content

C
core
Kaydet (Commit) d19932ac authored tarafından Peter Foley's avatar Peter Foley Kaydeden (comit) David Tardon
Dosyalara gözat
Seçenekler

fix libcdr with VS2012 

Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77
üst b23f3e48
Hide whitespace changes
Inline Side-by-side
Showing with 20 additions and 0 deletions
libcdr/ExternalProject_libcdr.mk
Dosyayı görüntüle @ d19932ac
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment