[Libreoffice-commits] .: liborcus/ExternalProject_liborcus.mk

[Libreoffice Gerrit user]

 liborcus/ExternalProject_liborcus.mk |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 5c19504b50a7098070ddee0dda9d3d28254bfe75
Author: Tor Lillqvist <tlillqvist at suse.com>
Date:   Fri Dec 14 00:15:43 2012 +0200

    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.

diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index 9de89da..595049b 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -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