strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix libcdr with VS2012

Browse source 
Change-Id: I9943dce422bd43b826baeaccaeb494d870aaaa77
This commit is contained in:
Peter Foley 2012-10-05 19:03:06 -04:00 committed by David Tardon
parent b23f3e4842
commit d19932ac57
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
libcdr/ExternalProject_libcdr.mk
View file

@ -22,6 +22,7 @@ $(eval $(call gb_ExternalProject_use_externals,libcdr,\
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(VCVER),90)
$(call gb_ExternalProject_get_state_target,libcdr,build) : $(call gb_ExternalProject_get_state_target,libcdr,build) :
cd $(EXTERNAL_WORKDIR)/build/win32 \ cd $(EXTERNAL_WORKDIR)/build/win32 \
&& export LIBWPD_INCLUDE_DIR=$(OUTDIR)/inc/external \ && 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 \ && export ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \ && $(COMPATH)/vcpackages/vcbuild.exe libcdr.vcproj "Release|Win32" \
&& touch $@ && 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 else