svn commit: r1815542 - /openoffice/trunk/main/oowintool

[damjan]

Author: damjan
Date: Fri Nov 17 02:05:43 2017
New Revision: 1815542

URL: http://svn.apache.org/viewvc?rev=1815542&view=rev
Log:
Allow oowintool to find 32 bit VC++ in Cygwin64.

Patch by: Damjan Jovanovic and Matthias Seidel
Tested by: Matthias Seidel


Modified:
    openoffice/trunk/main/oowintool

Modified: openoffice/trunk/main/oowintool
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/oowintool?rev=1815542&r1=1815541&r2=1815542&view=diff
==============================================================================
--- openoffice/trunk/main/oowintool (original)
+++ openoffice/trunk/main/oowintool Fri Nov 17 02:05:43 2017
@@ -217,6 +217,11 @@ sub find_msvs()
            $ver->{'product_dir'} = $install;
            return $ver;
        }
+       $install = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . 
$ver->{'key'});
+       if (defined $install && $install ne '') {
+           $ver->{'product_dir'} = $install;
+           return $ver;
+       }
     }
     die "Can't find MS Visual Studio / VC++";
 }
@@ -231,6 +236,11 @@ sub find_msvc()
        if (defined $install && $install ne '') {
            $ver->{'product_dir'} = $install;
            return $ver;
+       }
+       $install = reg_get_value("HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/" . 
$ver->{'key'});
+       if (defined $install && $install ne '') {
+           $ver->{'product_dir'} = $install;
+           return $ver;
        }
     }
     die "Can't find MS Visual Studio / VC++";