зеркало из https://github.com/mozilla/gecko-dev.git
Bug 569268 - Package correct Visual C++ CRT DLLs based on compiler version, r=nthomas
This commit is contained in:
Родитель
8beec9e10f
Коммит
20e7f4ceee
|
@ -86,6 +86,10 @@ ifdef MOZ_UPDATER
|
||||||
DEFINES += -DMOZ_UPDATER=1
|
DEFINES += -DMOZ_UPDATER=1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
ifdef _MSC_VER
|
||||||
|
DEFINES += -D_MSC_VER=$(_MSC_VER)
|
||||||
|
endif
|
||||||
|
|
||||||
# Don't ifdef MOZ_IPC this because mac ppc needs it too.
|
# Don't ifdef MOZ_IPC this because mac ppc needs it too.
|
||||||
include $(topsrcdir)/ipc/app/defs.mk
|
include $(topsrcdir)/ipc/app/defs.mk
|
||||||
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
|
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)
|
||||||
|
|
|
@ -57,10 +57,20 @@
|
||||||
@BINPATH@/mozce_shunt.dll
|
@BINPATH@/mozce_shunt.dll
|
||||||
#elifdef XP_WIN32
|
#elifdef XP_WIN32
|
||||||
#ifndef MOZ_MEMORY
|
#ifndef MOZ_MEMORY
|
||||||
|
#if _MSC_VER == 1400
|
||||||
@BINPATH@/Microsoft.VC80.CRT.manifest
|
@BINPATH@/Microsoft.VC80.CRT.manifest
|
||||||
@BINPATH@/msvcm80.dll
|
@BINPATH@/msvcm80.dll
|
||||||
@BINPATH@/msvcp80.dll
|
@BINPATH@/msvcp80.dll
|
||||||
@BINPATH@/msvcr80.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
|
#else
|
||||||
@BINPATH@/mozcrt19.dll
|
@BINPATH@/mozcrt19.dll
|
||||||
@BINPATH@/mozcpp19.dll
|
@BINPATH@/mozcpp19.dll
|
||||||
|
|
Загрузка…
Ссылка в новой задаче