[Libreoffice-commits] .: 3 commits - oowintool solenv/inc

[Tor Lillqvist]

 oowintool          |    9 +++++----
 solenv/inc/libs.mk |    4 ++++
 2 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit c9b40df2bf0443f32c04379594d17fd55939bbd2
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Mar 15 11:29:52 2011 +0200

    Revert "Let's try preferring MSVS2010/MSVC2010"
    
    This reverts commit 8cd4be6de9889485948e2fea02efbc8d74e55642.

diff --git a/oowintool b/oowintool
index cec0baa..70c73b7 100755
--- a/oowintool
+++ b/oowintool
@@ -158,7 +158,7 @@ my %msvc_2010 = (
 
 sub find_msvs()
 {
-    my @ms_versions = ( \%msvs_2010, \%msvs_2008, \%msvs_express_2008 );
+    my @ms_versions = ( \%msvs_2008, \%msvs_express_2008, \%msvs_2010 );
 
     for $ver (@ms_versions)
     {
@@ -173,7 +173,7 @@ sub find_msvs()
 
 sub find_msvc()
 {
-    my @ms_versions = ( \%msvc_2010, \%msvc_2008, \%msvc_express_2008 );
+    my @ms_versions = ( \%msvc_2008, \%msvc_express_2008, \%msvc_2010 );
 
     for $ver (@ms_versions)
     {
commit 6da491d71913ecc6cbc626d7231a6103a8183d37
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Mar 15 11:29:49 2011 +0200

    Revert "Prefer .NET 4, do not bother with .NET 2"
    
    This reverts commit ca448fbaf0b18edcfc809fcabcbcac51bb32f3b7.

diff --git a/oowintool b/oowintool
index 1c48a1d..cec0baa 100755
--- a/oowintool
+++ b/oowintool
@@ -207,8 +207,9 @@ sub print_msvs_productdir()
 sub print_csc_compiler_dir()
 {
     my $dir = cygpath (reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Microsoft/.NETFramework/InstallRoot"), 'w', $output_format);
-    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` ||
-                  `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1`;
+    my $csc_exe = `/bin/find "$dir" -iname csc.exe | grep "v3\.5\." | head -n 1` ||
+                  `/bin/find "$dir" -iname csc.exe | grep "v4\." | head -n 1` ||
+                  `/bin/find "$dir" -iname csc.exe | grep "v2\." | head -n 1`;
     print `dirname $csc_exe`;
 }
 
commit 65a266c499def94ff6b169e8e8dade3207c7012a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Mar 15 11:29:44 2011 +0200

    Revert "MSVC build creates icudt.lib"
    
    This reverts commit 15b8ac2a753c8080549f7f0cd23aca485eda3ad0.

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index 538ff55..f8ed465 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -364,7 +364,11 @@ AVMEDIALIB=iavmedia.lib
 ICUINLIB=icuin.lib
 ICULELIB=icule.lib
 ICUUCLIB=icuuc.lib
+.IF "$(GUI)"=="OS2"
 ICUDATALIB=icudt.lib
+.ELSE
+ICUDATALIB=icudata.lib
+.ENDIF
 I18NUTILLIB=ii18nutil.lib
 I18NISOLANGLIB=ii18nisolang.lib
 I18NPAPERLIB=ii18npaper.lib