wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 888158 - Make configure to detect Visual Studio 2013 compiler. r=ted

Browse Source
This commit is contained in:
Xavier Fung 2013-07-03 10:52:32 +09:00
parent d003539ad1
commit 221217ebbf
6 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,12 @@
#ifdef MOZ_METRO #ifdef MOZ_METRO
@BINPATH@/vccorlib110.dll @BINPATH@/vccorlib110.dll
#endif #endif
#elif MOZ_MSVC_REDIST == 1800
@BINPATH@/msvcp120.dll
@BINPATH@/msvcr120.dll
#ifdef MOZ_METRO
@BINPATH@/vccorlib120.dll
#endif
#endif #endif
#endif #endif
#endif #endif

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

@ -1443,6 +1443,13 @@ xpicleanup@BIN_SUFFIX@
vccorlib110.dll vccorlib110.dll
#endif #endif
#endif #endif
#if MOZ_MSVC_REDIST != 1800
msvcp120.dll
msvcr120.dll
#ifdef MOZ_METRO
vccorlib120.dll
#endif
#endif
plugins/npnul32.dll plugins/npnul32.dll
#endif #endif
@DLL_PREFIX@xpcom_core@DLL_SUFFIX@ @DLL_PREFIX@xpcom_core@DLL_SUFFIX@

7
build/win32/Makefile.in
View File

@ -56,6 +56,13 @@ REDIST_FILES = \
$(NULL) $(NULL)
endif endif
ifeq (1800,$(_MSC_VER))
REDIST_FILES = \
msvcp120.dll \
msvcr120.dll \
$(NULL)
endif
ifdef REDIST_FILES ifdef REDIST_FILES
libs-preqs = \ libs-preqs = \
$(call mkdir_deps,$(FINAL_TARGET)) \ $(call mkdir_deps,$(FINAL_TARGET)) \

10
configure.in
View File

@ -487,16 +487,18 @@ case "$target" in
AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.]) AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.])
fi fi
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
if test "$_CC_MAJOR_VERSION" = "16"; then if test "$_CC_MAJOR_VERSION" = "16"; then
_CC_SUITE=10 _CC_SUITE=10
_MSVS_VERSION=2010 _MSVS_VERSION=2010
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "17"; then elif test "$_CC_MAJOR_VERSION" = "17"; then
_CC_SUITE=11 _CC_SUITE=11
_MSVS_VERSION=2012 _MSVS_VERSION=2012
AC_DEFINE(_CRT_SECURE_NO_WARNINGS) elif test "$_CC_MAJOR_VERSION" = "18"; then
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS) _CC_SUITE=12
_MSVS_VERSION=2013
else else
AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
fi fi

9
js/src/configure.in
View File

@ -484,14 +484,15 @@ case "$target" in
AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.]) AC_MSG_ERROR([The major versions of \$CC and \$CXX do not match.])
fi fi
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
if test "$_CC_MAJOR_VERSION" = "16"; then if test "$_CC_MAJOR_VERSION" = "16"; then
_CC_SUITE=10 _CC_SUITE=10
AC_DEFINE(_CRT_SECURE_NO_WARNINGS)
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS)
elif test "$_CC_MAJOR_VERSION" = "17"; then elif test "$_CC_MAJOR_VERSION" = "17"; then
_CC_SUITE=11 _CC_SUITE=11
AC_DEFINE(_CRT_SECURE_NO_WARNINGS) elif test "$_CC_MAJOR_VERSION" = "18"; then
AC_DEFINE(_CRT_NONSTDC_NO_WARNINGS) _CC_SUITE=12
else else
AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.]) AC_MSG_ERROR([This version ($CC_VERSION) of the MSVC compiler is unsupported. See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
fi fi

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

@ -84,6 +84,9 @@ endif
ifeq ($(_MSC_VER),1700) ifeq ($(_MSC_VER),1700)
JSSHELL_BINS += $(DIST)/bin/msvcr110.dll JSSHELL_BINS += $(DIST)/bin/msvcr110.dll
endif endif
ifeq ($(_MSC_VER),1800)
JSSHELL_BINS += $(DIST)/bin/msvcr120.dll
endif
ifdef MOZ_FOLD_LIBS ifdef MOZ_FOLD_LIBS
JSSHELL_BINS += $(DIST)/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX) JSSHELL_BINS += $(DIST)/bin/$(DLL_PREFIX)nss3$(DLL_SUFFIX)
else else