Kaydet (Commit) 5c19504b authored tarafından Tor Lillqvist's avatar Tor Lillqvist Kaydeden (comit) Tor Lillqvist

Make MSBuild actually run the 2012 compiler when that is what we use

The /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 options are
needed to indicate that we want that. Otherwise MSBuild, when
presented with a .vcxproj file created by VS2010, will assume it is
the 2010 compiler that should be used. This will then lead to link
errors pointing outthe incompatibility when linking the static
liborcus into the scfilt DLL.
üst 1d486e6c
......@@ -27,7 +27,7 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& $(COMPATH)/vcpackages/vcbuild.exe liborcus-static-nozip.vcproj "Release|Win32" \
&& touch $@
else
else ifeq ($(VCVER),100)
$(call gb_ExternalProject_get_state_target,liborcus,build) :
cd $(EXTERNAL_WORKDIR)/vsprojects/liborcus-static-nozip \
&& export BOOST_INCLUDE_DIR=$(OUTDIR)/inc/external \
......@@ -35,6 +35,14 @@ $(call gb_ExternalProject_get_state_target,liborcus,build) :
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& MSBuild.exe liborcus-static-nozip.vcxproj /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
&& 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 ZLIB_INCLUDE_DIR=$(OUTDIR)/inc/external/zlib \
&& export BOOST_LIB_DIR=$(OUTDIR)/lib \
&& MSBuild.exe liborcus-static-nozip.vcxproj /p:PlatformToolset=v110 /p:VisualStudioVersion=11.0 /p:Configuration=Release /p:OutDir=Release/ /p:TargetName=orcus /p:WholeProgramOptimization=no \
&& 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