strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop msvc*7*.dll, see fdo#32426

Browse source
This commit is contained in:
Tor Lillqvist 2010-12-21 19:07:12 +02:00 committed by Tor Lillqvist
parent 4ce4ff8a53
commit b326d5decb
2 changed files with 0 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
post_download.in
View file

@ -113,15 +113,3 @@ Get the version corresponding to your Visual Studio from the Microsoft site
and put it into external/vcredist.])
fi
fi
dnl ===================================================================
dnl Windows builds with MSVS 2008/2010 need msvcr71.dll in external/msvcp71
dnl ===================================================================
if test "$_os" = "WINNT"; then
AC_MSG_CHECKING([for msvcr71.dll])
if test -f ./external/msvcp71/msvcr71.dll; then
AC_MSG_RESULT([found])
else
AC_MSG_ERROR([msvcr71.dll is missing in external/msvcp71.])
fi
fi

14
solenv/bin/modules/installer/control.pm
View file

@ -77,7 +77,6 @@ sub check_system_path
{
# The following files have to be found in the environment variable PATH
# All platforms: zip
# Windows only: msvcp70.dll, msvcr70.dll for regcomp.exe
# Windows only: "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.exe" for msi database and packaging
my $onefile;
@ -105,19 +104,6 @@ sub check_system_path
if (($installer::globals::iswin) && ($installer::globals::iswindowsbuild))
{
@needed_files_in_path = ("zip.exe", "msiinfo.exe", "msidb.exe", "uuidgen.exe", "makecab.exe", "msitran.exe", "expand.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)
{