Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 687225 - Detect MSVC 2011 compiler. r=ted

Browse Source
This commit is contained in:
Gregory Szorc 2011-10-03 21:57:00 -04:00
parent 29da26def0
commit 60408a7712
8 changed files with 45 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/installer/package-manifest.in
View File

@ -71,6 +71,9 @@
#elif _MSC_VER == 1600
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#elif _MSC_VER == 1700
@BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll
#endif
#endif

4
browser/installer/removed-files.in
View File

@ -1288,6 +1288,10 @@ xpicleanup@BIN_SUFFIX@
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#endif
#if _MSC_VER != 1700
@BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll
#endif
mozcrt19.dll
mozcpp19.dll
#endif

33
build/win32/Makefile.in
View File

@ -71,27 +71,34 @@ ifndef MOZ_DEBUG
ifeq (1400,$(_MSC_VER))
REDIST_FILES = \
Microsoft.VC80.CRT.manifest \
msvcm80.dll \
msvcp80.dll \
msvcr80.dll \
$(NULL)
Microsoft.VC80.CRT.manifest \
msvcm80.dll \
msvcp80.dll \
msvcr80.dll \
$(NULL)
endif
ifeq (1500,$(_MSC_VER))
REDIST_FILES = \
Microsoft.VC90.CRT.manifest \
msvcm90.dll \
msvcp90.dll \
msvcr90.dll \
$(NULL)
Microsoft.VC90.CRT.manifest \
msvcm90.dll \
msvcp90.dll \
msvcr90.dll \
$(NULL)
endif
ifeq (1600,$(_MSC_VER))
REDIST_FILES = \
msvcp100.dll \
msvcr100.dll \
$(NULL)
msvcp100.dll \
msvcr100.dll \
$(NULL)
endif
ifeq (1700,$(_MSC_VER))
REDIST_FILES = \
msvcp110.dll \
msvcr110.dll \
$(NULL)
endif
ifdef REDIST_FILES

4
configure.in
View File

@ -740,6 +740,10 @@ case "$target" in
_CC_SUITE=10
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "17"; then
_CC_SUITE=11
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
else
AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
fi

4
js/src/configure.in
View File

@ -742,6 +742,10 @@ case "$target" in
_CC_SUITE=10
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "17"; then
_CC_SUITE=11
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
else
AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
fi

3
mobile/installer/package-manifest.in
View File

@ -72,6 +72,9 @@
#elif _MSC_VER == 1600
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#elif _MSC_VER == 1700
@BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll
#endif
#endif

4
mobile/installer/removed-files.in
View File

@ -19,6 +19,10 @@ extensions/feedback@mobile.mozilla.org.xpi
@BINPATH@/msvcp100.dll
@BINPATH@/msvcr100.dll
#endif
#if _MSC_VER != 1700
@BINPATH@/msvcp110.dll
@BINPATH@/msvcr110.dll
#endif
mozcrt19.dll
mozcpp19.dll
#endif

3
toolkit/mozapps/installer/packager.mk
View File

@ -104,6 +104,9 @@ endif
ifeq ($(_MSC_VER),1600)
JSSHELL_BINS += $(DIST)/bin/msvcr100.dll
endif
ifeq ($(_MSC_VER),1700)
JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
endif
else
JSSHELL_BINS += \
$(DIST)/bin/$(LIB_PREFIX)plds4$(DLL_SUFFIX) \