Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-07 18:04:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1114577 - Drop support for Windows SDK versions <8.1. r=glandium, f=jacek

Browse Source
This commit is contained in:
Ryan VanderMeulen 2015-01-07 11:32:07 -05:00
parent 87d1119af9
commit 0ef93eb5c2
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
configure.in
View File

@ -415,30 +415,27 @@ MOZ_ARG_ENABLE_BOOL(metro,
MOZ_METRO=)
if test -n "$MOZ_METRO"; then
AC_DEFINE(MOZ_METRO)
# Target the Windows 8 Kit
WINSDK_TARGETVER=602
WINVER=502
# toolkit/library/makefile.in needs these, see nsDllMain.
CRTDLLVERSION=110
CRTEXPDLLVERSION=1-1-0
else
# Target the Windows 7 SDK by default
WINSDK_TARGETVER=601
WINVER=502
fi
AC_SUBST(CRTDLLVERSION)
AC_SUBST(CRTEXPDLLVERSION)
# Target the Windows 8.1 SDK by default
WINSDK_TARGETVER=603
WINVER=502
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
Windows SDK version to target. Lowest version
currently allowed is 601 (Win7), highest is 602 (Win8)],
Windows SDK version to target. Win8.1 (603) is
currently the minimum supported version.],
WINSDK_TARGETVER=$withval)
# Currently only two sdk versions allowed, 601 and 602
# Currently only version 603 is allowed
case "$WINSDK_TARGETVER" in
601|602)
603)
MOZ_WINSDK_TARGETVER=0${WINSDK_TARGETVER}0000
;;
@ -685,7 +682,7 @@ case "$target" in
# causing problems with local implementations with the same name.
AC_DEFINE(STRSAFE_NO_DEPRECATE)
MOZ_WINSDK_MAXVER=0x06020000
MOZ_WINSDK_MAXVER=0x06030000
fi # !GNU_CC
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)

21
js/src/configure.in
View File

@ -346,24 +346,21 @@ MOZ_ARG_ENABLE_BOOL(metro,
MOZ_METRO=)
if test -n "$MOZ_METRO"; then
AC_DEFINE(MOZ_METRO)
# Target the Windows 8 Kit
WINSDK_TARGETVER=602
WINVER=502
else
# Target the Windows 7 SDK by default
WINSDK_TARGETVER=601
WINVER=502
fi
# Target the Windows 8.1 SDK by default
WINSDK_TARGETVER=603
WINVER=502
MOZ_ARG_WITH_STRING(windows-version,
[ --with-windows-version=WINSDK_TARGETVER
Windows SDK version to target. Lowest version
currently allowed is 601, highest is 602],
Windows SDK version to target. Win8.1 (603) is
currently the minimum supported version.],
WINSDK_TARGETVER=$withval)
# Currently only two sdk versions allowed, 601 and 602
# Currently only version 603 is allowed
case "$WINSDK_TARGETVER" in
601|602)
603)
MOZ_WINSDK_TARGETVER=0${WINSDK_TARGETVER}0000
;;
@ -495,7 +492,7 @@ case "$target" in
AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
fi
MOZ_WINSDK_MAXVER=0x06010000
MOZ_WINSDK_MAXVER=0x06030000
fi # !GNU_CC
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)