Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1197281 - Use MOZ_FIND_WINSDK_VERSION for MOZ_WINSDK_MAXVER on mingw. r=glandium

Browse Source
This commit is contained in:
Jacek Caban 2015-10-07 12:26:40 +02:00
parent 41c0e5355c
commit ef98cfc55b
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.in
View File

@ -478,6 +478,9 @@ EOF
fi
fi
AC_PROG_CPP
AC_PROG_CXXCPP
dnl ========================================================
dnl Special win32 checks
dnl ========================================================
@ -667,8 +670,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
fi
CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
MOZ_FIND_WINSDK_VERSION
else
# Check w32api version
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
@ -720,10 +721,9 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
# strsafe.h on mingw uses macros for function deprecation that pollutes namespace
# causing problems with local implementations with the same name.
AC_DEFINE(STRSAFE_NO_DEPRECATE)
MOZ_WINSDK_MAXVER=0x06030000
fi # !GNU_CC
MOZ_FIND_WINSDK_VERSION
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
# Require OS features provided by IE 6.0 SP2 (XP SP2)
@ -745,9 +745,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
;;
esac
AC_PROG_CPP
AC_PROG_CXXCPP
if test -n "$_WIN32_MSVC"; then
SKIP_PATH_CHECKS=1
SKIP_COMPILER_CHECKS=1

10
js/src/configure.in
View File

@ -305,6 +305,8 @@ MOZ_TOOL_VARIABLES
MOZ_CHECK_COMPILER_WRAPPER
AC_PROG_CPP
AC_PROG_CXXCPP
MOZ_RUST_SUPPORT
dnl Special win32 checks
@ -436,8 +438,6 @@ case "$target" in
CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
MOZ_FIND_WINSDK_VERSION
else
# Check w32api version
_W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'`
@ -473,10 +473,9 @@ case "$target" in
then
AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
fi
MOZ_WINSDK_MAXVER=0x06030000
fi # !GNU_CC
MOZ_FIND_WINSDK_VERSION
AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
# Require OS features provided by IE 6.0 SP2 (XP SP2)
@ -496,9 +495,6 @@ case "$target" in
;;
esac
AC_PROG_CPP
AC_PROG_CXXCPP
if test -n "$_WIN32_MSVC"; then
SKIP_PATH_CHECKS=1
SKIP_COMPILER_CHECKS=1