Fix windows bustage (looking for msvcp80.dll) following the Lorentz landing on 1.9.2. rs=philor,no bug

This commit is contained in:
Mark Banner 2010-04-08 19:29:25 +01:00
Родитель 9855a340c9
Коммит 76380a8610
3 изменённых файлов: 0 добавлений и 13 удалений

Просмотреть файл

@ -6099,14 +6099,7 @@ if test "$MOZ_MEMORY"; then
WIN32_CRT_SRC_DIR=`cd "$WIN32_CRT_SRC_DIR" && pwd -W`
_objdir_win=`pwd -W`
WIN32_CUSTOM_CRT_DIR="$_objdir_win/mozilla/memory/jemalloc/crtsrc/build/$_WIN32_CRT_CPU"
if test "$MOZILLA_1_9_2_BRANCH" = "1"; then
dnl Statically link the C++ stdlib. We only use this for Breakpad anyway.
AC_DEFINE(_STATIC_CPPLIB)
MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -DEFAULTLIB:mozcrt19"
else
MOZ_MEMORY_LDFLAGS="-MANIFEST:NO -LIBPATH:\"$WIN32_CUSTOM_CRT_DIR\" -NODEFAULTLIB:msvcrt -NODEFAULTLIB:msvcrtd -NODEFAULTLIB:msvcprt -NODEFAULTLIB:msvcprtd -DEFAULTLIB:mozcrt19 -DEFAULTLIB:mozcpp19"
fi
dnl Also pass this to NSPR/NSS
DLLFLAGS="$DLLFLAGS $MOZ_MEMORY_LDFLAGS"
export DLLFLAGS

Просмотреть файл

@ -78,11 +78,9 @@
@BINPATH@/msvcr80.dll
#else
@BINPATH@/mozcrt19.dll
#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/mozcpp19.dll
#endif
#endif
#endif
#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
#endif
@ -576,9 +574,7 @@
@BINPATH@/components/windowds.xpt
@BINPATH@/components/dom_xpath.xpt
@BINPATH@/components/lwbrk.xpt
#ifndef MOZILLA_1_9_2_BRANCH
@BINPATH@/components/nsINIProcessor.js
#endif
@BINPATH@/components/nsTryToClose.js
@BINPATH@/components/pluginGlue.js
@BINPATH@/components/txEXSLTRegExFunctions.js

Просмотреть файл

@ -300,11 +300,9 @@ msvcp80.dll
msvcr80.dll
#else
mozcrt19.dll
#ifdef MOZILLA_1_9_2_BRANCH
mozcpp19.dll
#endif
#endif
#endif
mozilla-installer-bin
nsldap32v50.dll
@DLL_PREFIX@ldap50@DLL_SUFFIX@