mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-19 09:30:44 +00:00
Bug 208461 - midl semantics changed (VC++ .NET 2003). r=bryner
This commit is contained in:
parent
9b55dce504
commit
7386551ac2
@ -94,9 +94,9 @@ OS_LIBS = \
|
||||
$(MIDL_GENERATED_FILES): done_gen
|
||||
|
||||
done_gen: ISimpleDOMNode.idl ISimpleDOMDocument.idl ISimpleDOMText.idl
|
||||
$(MIDL) $(srcdir)/ISimpleDOMNode.idl
|
||||
$(MIDL) $(srcdir)/ISimpleDOMDocument.idl
|
||||
$(MIDL) $(srcdir)/ISimpleDOMText.idl
|
||||
$(MIDL) $(MIDL_FLAGS) $(srcdir)/ISimpleDOMNode.idl
|
||||
$(MIDL) $(MIDL_FLAGS) $(srcdir)/ISimpleDOMDocument.idl
|
||||
$(MIDL) $(MIDL_FLAGS) $(srcdir)/ISimpleDOMText.idl
|
||||
touch $@
|
||||
|
||||
EXPORTS = \
|
||||
|
@ -202,6 +202,7 @@ IMPLIB = @IMPLIB@
|
||||
FILTER = @FILTER@
|
||||
BIN_FLAGS = @BIN_FLAGS@
|
||||
MIDL = @MIDL@
|
||||
MIDL_FLAGS = @MIDL_FLAGS@
|
||||
|
||||
DLL_PREFIX = @DLL_PREFIX@
|
||||
LIB_PREFIX = @LIB_PREFIX@
|
||||
|
22
configure.in
22
configure.in
@ -361,8 +361,24 @@ case "$target" in
|
||||
_MIDL_MAJOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $ 1 }'`
|
||||
_MIDL_MINOR_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $ 2 }'`
|
||||
_MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $ 3 }'`
|
||||
if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347"; then
|
||||
AC_MSG_ERROR([Midl version $_MIDL_FULL_VERSION was found. Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7).])
|
||||
if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347" -a "$_MIDL_FULL_VERSION" != "6.00.0361"; then
|
||||
AC_MSG_ERROR([Midl version $_MIDL_FULL_VERSION was found. Midl version must be 5.x.x (VC6*) or 6.00.0347 (VC7) or 6.00.0361 (VC.net 2003).])
|
||||
fi
|
||||
|
||||
# Add flags if necessary
|
||||
AC_MSG_CHECKING([for midl flags])
|
||||
if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then
|
||||
# Starting with MIDL version 6.0.359, the MIDL compiler
|
||||
# generates /Oicf /robust stubs by default, which is not
|
||||
# compatible with versions of Windows older than Win2k.
|
||||
# This switches us back to the old behaviour. When we drop
|
||||
# support for Windows older than Win2k, we should remove
|
||||
# this.
|
||||
MIDL_FLAGS="${MIDL_FLAGS} /no_robust"
|
||||
AC_MSG_RESULT([need /no_robust])
|
||||
else
|
||||
MIDL_FLAGS="${MIDL_FLAGS}"
|
||||
AC_MSG_RESULT([none needed])
|
||||
fi
|
||||
else
|
||||
# Check w32api version
|
||||
@ -403,6 +419,8 @@ case "$target" in
|
||||
;;
|
||||
esac
|
||||
|
||||
AC_SUBST(MIDL_FLAGS)
|
||||
|
||||
if test -n "$_WIN32_MSVC"; then
|
||||
SKIP_PATH_CHECKS=1
|
||||
SKIP_COMPILER_CHECKS=1
|
||||
|
@ -112,7 +112,7 @@ $(DEFFILE): mkctldef.sh
|
||||
$(srcdir)/mkctldef.sh $@
|
||||
|
||||
done_gen: MozillaControl.idl
|
||||
$(MIDL) /Oicf /h MozillaControl.h /iid MozillaControl_i.c $(srcdir)/MozillaControl.idl
|
||||
$(MIDL) $(MIDL_FLAGS) /Oicf /h MozillaControl.h /iid MozillaControl_i.c $(srcdir)/MozillaControl.idl
|
||||
touch $@
|
||||
|
||||
$(MIDL_GENERATED_FILES): done_gen
|
||||
|
@ -60,7 +60,7 @@ $(MIDL_GENERATED_FILES): done_gen
|
||||
|
||||
done_gen: IPalmSync.idl
|
||||
$(RM) $(SRCDIR_CSRCS)
|
||||
$(MIDL) $(UNICODE_FLAGS) $(srcdir)/IPalmSync.idl
|
||||
$(MIDL) $(MIDL_FLAGS) $(UNICODE_FLAGS) $(srcdir)/IPalmSync.idl
|
||||
touch $@
|
||||
|
||||
export:: done_gen
|
||||
|
@ -55,13 +55,13 @@ SRCS_IN_OBJDIR = 1
|
||||
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
|
||||
DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE
|
||||
DEFINES += -DREGISTER_PROXY_DLL -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x400
|
||||
|
||||
$(MIDL_GENERATED_FILES): done_gen
|
||||
|
||||
done_gen: msgMapi.idl
|
||||
$(RM) $(SRCDIR_CSRCS)
|
||||
$(MIDL) $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
|
||||
$(MIDL) $(MIDL_FLAGS) $(UNICODE_FLAGS) $(srcdir)/msgMapi.idl
|
||||
touch $@
|
||||
|
||||
export:: done_gen
|
||||
|
Loading…
x
Reference in New Issue
Block a user