author | Ted Mielczarek <ted.mielczarek@gmail.com> |
Wed, 02 Jun 2010 09:49:29 +1200 | |
changeset 43000 | 9837814d8d86c92c48d76dd3d833ad686cd3f4d5 |
parent 42999 | 8385a247ab0c0d6c6e0641bd68e4a062991fd5fa |
child 43001 | 02dfc932abde824d493bec3ec5e81b658cd4a5cf |
push id | 13565 |
push user | nthomas@mozilla.com |
push date | Tue, 01 Jun 2010 22:14:24 +0000 |
treeherder | mozilla-central@bf3c27a3829f [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nthomas |
bugs | 569268 |
milestone | 1.9.3a5pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
browser/installer/Makefile.in | file | annotate | diff | comparison | revisions | |
browser/installer/package-manifest.in | file | annotate | diff | comparison | revisions |
--- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -81,16 +81,20 @@ endif ifdef NSS_DISABLE_DBM DEFINES += -DNSS_DISABLE_DBM=1 endif ifdef MOZ_UPDATER DEFINES += -DMOZ_UPDATER=1 endif +ifdef _MSC_VER +DEFINES += -D_MSC_VER=$(_MSC_VER) +endif + # Don't ifdef MOZ_IPC this because mac ppc needs it too. include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) ifdef MOZ_PKG_MANIFEST_P MOZ_PKG_MANIFEST = package-manifest $(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P)
--- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -52,20 +52,30 @@ #ifdef MOZ_IPC @BINPATH@/@MOZ_CHILD_PROCESS_NAME@ #endif #endif #ifdef WINCE @BINPATH@/mozce_shunt.dll #elifdef XP_WIN32 #ifndef MOZ_MEMORY +#if _MSC_VER == 1400 @BINPATH@/Microsoft.VC80.CRT.manifest @BINPATH@/msvcm80.dll @BINPATH@/msvcp80.dll @BINPATH@/msvcr80.dll +#elif _MSC_VER == 1500 +@BINPATH@/Microsoft.VC90.CRT.manifest +@BINPATH@/msvcm90.dll +@BINPATH@/msvcp90.dll +@BINPATH@/msvcr90.dll +#elif _MSC_VER == 1600 +@BINPATH@/msvcp100.dll +@BINPATH@/msvcr100.dll +#endif #else @BINPATH@/mozcrt19.dll @BINPATH@/mozcpp19.dll #endif #endif [browser] ; [Base Browser Files]