Skip to content

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

fix liborcus build with VS2012 

Change-Id: I98248b2fe45da32fc0f478aee55b6939825112f7
üst 2db6f67b
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 1 deletion
liborcus/ExternalProject_liborcus.mk
Dosyayı görüntüle @ a97fdbda
...@@ -17,13 +17,23 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\ ...@@ -17,13 +17,23 @@ $(eval $(call gb_ExternalProject_register_targets,liborcus,\
ifeq ($(OS)$(COM),WNTMSC) ifeq ($(OS)$(COM),WNTMSC)
ifeq ($(CCNUMVER),90)
$(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \ cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \ && export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \ && export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \ && $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
&& touch $@ && touch $@
else
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/../Common7/Tools/vcupgrade.exe liborcus-static-nozip.vcproj \
&& MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release /p:TargetName=orcus /p:WholeProgramOptimization=no \
&& touch $@
endif
else else
$(call gb_ExternalProject_get_state_target,liborcus,build) : $(call gb_ExternalProject_get_state_target,liborcus,build) :
......
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