[Libreoffice-commits] .: Branch 'feature/vs2012' - 2 commits - configure.in oowintool

[Libreoffice Gerrit user]

 configure.in |    8 ++++++--
 oowintool    |    2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 8fe1db7e793b8a608c48a0c2eb95efd85c9385d5
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Sep 19 11:14:20 2012 -0400

    prefer msbuild 3.5 with VS2010
    
    Change-Id: I111014ed9a05bdfe30234b87322c62f5227bc3b8

diff --git a/oowintool b/oowintool
index 58ea153..0ebbaea 100755
--- a/oowintool
+++ b/oowintool
@@ -229,7 +229,7 @@ sub print_csc_compiler_dir()
 {
     my $csc_exe;
     my $ver = find_msvc();
-    if ($ver->{'ver'} == "9.0") {
+    if ($ver->{'ver'} == "9.0" || $ver->{'ver'} == "10.0") {
         # We need to compile C# with the 3.5 or 2.0 compiler in order
         # for the assemblies to be loadable by managed C++ code
         # compiled with MSVC 2008.
commit 12591dc4f667ebaacefca34d214d23f6570b08ef
Author: Peter Foley <pefoley2 at verizon.net>
Date:   Wed Sep 19 11:13:25 2012 -0400

    only add win8 lib path for win8 sdk
    
    Change-Id: I9b30e5e0a8f961df1070f4ceb0e330558ab16335

diff --git a/configure.in b/configure.in
index 6f3898b..bce17c8 100644
--- a/configure.in
+++ b/configure.in
@@ -12330,11 +12330,15 @@ if test "$build_os" = "cygwin"; then
     if test "$CL_X64" = "TRUE"; then
         ILIB="$ILIB;$COMPATH/lib/amd64"
         ILIB="$ILIB;$WINDOWS_SDK_HOME/lib64"
-		ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64"
+		if test "$WINDOWS_SDK_VERSION" = "80"; then
+			ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x64"
+		fi
     else
         ILIB="$ILIB;$COMPATH/lib"
         ILIB="$ILIB;$WINDOWS_SDK_HOME/lib"
-		ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86"
+		if test "$WINDOWS_SDK_VERSION" = "80"; then
+			ILIB="$ILIB;$WINDOWS_SDK_HOME/lib/win8/um/x86"
+		fi
     fi
     ILIB="$ILIB;$DOTNET_FRAMEWORK_HOME/lib"