diff options
| author | Kurt Zenker <kz@openoffice.org> | 2004-06-18 15:53:40 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2004-06-18 15:53:40 +0000 |
| commit | c240a0f173ad4f46e6aa2cfab142b9687507a19e (patch) | |
| tree | 85529220bc0aac0150bed1bf4219704f22b7f9ea /solenv/bin/modules/installer/control.pm | |
| parent | 85b62663a5edc7700f45ee4df2a9c416f5ac102b (diff) | |
#i10000# perparing wntmsci10
Diffstat (limited to 'solenv/bin/modules/installer/control.pm')
| -rw-r--r-- | solenv/bin/modules/installer/control.pm | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/solenv/bin/modules/installer/control.pm b/solenv/bin/modules/installer/control.pm index c9c25f675160..2a37f19315d1 100644 --- a/solenv/bin/modules/installer/control.pm +++ b/solenv/bin/modules/installer/control.pm @@ -2,9 +2,9 @@ # # $RCSfile: control.pm,v $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # -# last change: $Author: kz $ $Date: 2004-06-11 18:14:48 $ +# last change: $Author: kz $ $Date: 2004-06-18 16:53:40 $ # # The Contents of this file are made available subject to the terms of # either of the following licenses @@ -93,7 +93,20 @@ sub check_system_path if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild)) { - @needed_files_in_path = ("zip.exe", "unzip.exe", "msvcp70.dll", "msvcr70.dll", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe"); + @needed_files_in_path = ("zip.exe", "unzip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe"); + + if ( $installer::globals::compiler eq "wntmsci8" ) + { + push(@needed_files_in_path, "msvcp70.dll"); + push(@needed_files_in_path, "msvcr70.dll"); + } + + if ( $installer::globals::compiler eq "wntmsci10" ) + { + push(@needed_files_in_path, "msvcp71.dll"); + push(@needed_files_in_path, "msvcr71.dll"); + } + } elsif ($installer::globals::iswin) { |