From 67c08f0b9ec010514ae62dab6e94c7653237b29e Mon Sep 17 00:00:00 2001 From: "timeless%mozdev.org" Date: Tue, 23 Nov 2004 19:34:02 +0000 Subject: [PATCH] Bug 249782 Make Mozilla compile with Microsoft Visual Studio 2005 patch by sdwalker@myrealbox.com r=bryner git-svn-id: svn://10.0.0.236/trunk@165657 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/config/autoconf.mk.in | 1 + mozilla/config/config.mk | 22 +++++++++---------- mozilla/config/rules.mk | 12 ++++++++++ mozilla/configure.in | 9 ++++++-- .../browser/activex/src/common/Makefile.in | 4 ++-- .../browser/activex/src/control/Makefile.in | 4 +++- .../activex/src/control_kicker/Makefile.in | 4 +++- .../browser/activex/src/plugin/Makefile.in | 4 ++-- .../extensions/xmlextras/tests/Makefile.in | 7 ++---- mozilla/js/src/Makefile.in | 4 ++++ mozilla/js/src/xpconnect/src/Makefile.in | 2 ++ mozilla/mailnews/import/Makefile.in | 2 -- mozilla/mailnews/import/build/Makefile.in | 4 ---- mozilla/modules/libjar/standalone/Makefile.in | 2 +- mozilla/modules/libreg/standalone/Makefile.in | 2 +- mozilla/modules/plugin/base/src/Makefile.in | 7 ++---- .../samples/default/windows/Makefile.in | 5 ++--- mozilla/modules/zlib/standalone/Makefile.in | 2 +- .../windows/wizard/setup/Makefile.in | 2 +- .../windows/wizard/setuprsc/Makefile.in | 2 +- .../windows/wizard/uninstall/Makefile.in | 2 +- mozilla/widget/src/windows/Makefile.in | 8 ++----- mozilla/xpcom/obsolete/nsFileStream.h | 4 ++-- mozilla/xpcom/tests/Makefile.in | 10 ++------- mozilla/xpinstall/cleanup/Makefile.in | 2 +- .../xpinstall/wizard/libxpnet/src/Makefile.in | 2 +- .../wizard/libxpnet/test/Makefile.in | 2 +- .../wizard/os2/nsinstall/Makefile.in | 1 - .../xpinstall/wizard/os2/setup/Makefile.in | 1 - .../xpinstall/wizard/os2/setuprsc/Makefile.in | 1 - .../wizard/os2/uninstall/Makefile.in | 1 - .../windows/GetShortPathName/Makefile.in | 2 +- .../xpinstall/wizard/windows/ds32/Makefile.in | 2 +- .../wizard/windows/nsinstall/Makefile.in | 2 +- .../wizard/windows/nsztool/Makefile.in | 2 +- .../wizard/windows/palmsync/Makefile.in | 2 +- .../wizard/windows/ren8dot3/Makefile.in | 2 +- .../wizard/windows/setup/Makefile.in | 2 +- .../wizard/windows/setuprsc/Makefile.in | 2 +- .../wizard/windows/uninstall/Makefile.in | 2 +- 40 files changed, 76 insertions(+), 77 deletions(-) diff --git a/mozilla/config/autoconf.mk.in b/mozilla/config/autoconf.mk.in index 31ec3f2e614..1334beadaff 100644 --- a/mozilla/config/autoconf.mk.in +++ b/mozilla/config/autoconf.mk.in @@ -251,6 +251,7 @@ FILTER = @FILTER@ BIN_FLAGS = @BIN_FLAGS@ MIDL = @MIDL@ MIDL_FLAGS = @MIDL_FLAGS@ +_MSC_VER = @_MSC_VER@ DLL_PREFIX = @DLL_PREFIX@ LIB_PREFIX = @LIB_PREFIX@ diff --git a/mozilla/config/config.mk b/mozilla/config/config.mk index 065631da166..8c180ea783b 100644 --- a/mozilla/config/config.mk +++ b/mozilla/config/config.mk @@ -331,7 +331,7 @@ endif # if MOZ_COVERAGE is set, we handle pdb files slightly differently ifdef MOZ_COVERAGE MOZ_OPTIMIZE_FLAGS=-Zi -O1 -UDEBUG -DNDEBUG -OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS = /DEBUG /PDB:NONE /OPT:REF /OPT:nowin98 _ORDERFILE := $(wildcard $(srcdir)/win32.order) ifneq (,$(_ORDERFILE)) OS_LDFLAGS += /ORDER:@$(srcdir)/win32.order @@ -345,7 +345,7 @@ endif # ifdef NS_TRACE_MALLOC MOZ_OPTIMIZE_FLAGS=-Zi -Od -UDEBUG -DNDEBUG -OS_LDFLAGS = /DEBUG /DEBUGTYPE:CV /PDB:NONE /OPT:REF /OPT:nowin98 +OS_LDFLAGS = /DEBUG /PDB:NONE /OPT:REF /OPT:nowin98 endif # NS_TRACE_MALLOC @@ -646,20 +646,19 @@ ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) #// #//------------------------------------------------------------------------ ifdef USE_STATIC_LIBS -RTL_FLAGS=-MT # Statically linked multithreaded RTL -ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) -RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL -endif # MOZ_DEBUG || NS_TRACE_MALLOC - -else # !USE_STATIC_LIBS - -ifdef USE_NON_MT_LIBS +ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) RTL_FLAGS=-ML # Statically linked non-multithreaded LIBC RTL ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) RTL_FLAGS=-MLd # Statically linked non-multithreaded LIBC debug RTL endif # MOZ_DEBUG || NS_TRACE_MALLOC +else +RTL_FLAGS=-MT # Statically linked multithreaded RTL +ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) +RTL_FLAGS=-MTd # Statically linked multithreaded MSVC4.0 debug RTL +endif # MOZ_DEBUG || NS_TRACE_MALLOC +endif # _MSC_VER -else # ! USE_NON_MT_LIBS +else # !USE_STATIC_LIBS RTL_FLAGS=-MD # Dynamically linked, multithreaded RTL ifneq (,$(MOZ_DEBUG)$(NS_TRACE_MALLOC)) @@ -667,7 +666,6 @@ ifndef MOZ_NO_DEBUG_RTL RTL_FLAGS=-MDd # Dynamically linked, multithreaded MSVC4.0 debug RTL endif endif # MOZ_DEBUG || NS_TRACE_MALLOC -endif # USE_NON_MT_LIBS endif # USE_STATIC_LIBS endif # WINNT && !GNU_CC diff --git a/mozilla/config/rules.mk b/mozilla/config/rules.mk index 9f9403fa1dc..b17d849832a 100644 --- a/mozilla/config/rules.mk +++ b/mozilla/config/rules.mk @@ -210,6 +210,18 @@ endif #endif endif # !GNU_CC + +ifdef ENABLE_CXX_EXCEPTIONS +ifdef GNU_CC +CXXFLAGS += -fexceptions +else +ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) +CXXFLAGS += -GX +else +CXXFLAGS += -EHsc +endif # _MSC_VER +endif # GNU_CC +endif # ENABLE_CXX_EXCEPTIONS endif # WINNT ifndef TARGETS diff --git a/mozilla/configure.in b/mozilla/configure.in index 0a9ff6711a5..d1b2f68828f 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -318,6 +318,8 @@ case "$target" in # Determine compiler version CC_VERSION=`"${CC}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'` _CC_MAJOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $1 }'` + _CC_MINOR_VERSION=`echo ${CC_VERSION} | $AWK -F\. '{ print $2 }'` + _MSC_VER=${_CC_MAJOR_VERSION}${_CC_MINOR_VERSION} CXX_VERSION=`"${CXX}" -v 2>&1 | grep Version | sed -e 's|.* Version ||' -e 's| .*||'` _CXX_MAJOR_VERSION=`echo ${CXX_VERSION} | $AWK -F\. '{ print $1 }'` @@ -329,6 +331,8 @@ case "$target" in _CC_SUITE=6 elif test "$_CC_MAJOR_VERSION" = "13"; then _CC_SUITE=7 + elif test "$_CC_MAJOR_VERSION" = "14"; then + _CC_SUITE=8 else AC_MSG_ERROR([This version of the MSVC compiler, $CC_VERSION , is unsupported.]) fi @@ -346,8 +350,8 @@ 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" -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).]) + if test "$_MIDL_MAJOR_VERSION" != "5" -a "$_MIDL_FULL_VERSION" != "6.00.0347" -a "$_MIDL_FULL_VERSION" != "6.00.0361" -a "$_MIDL_FULL_VERSION" != "6.00.0364"; 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) or 6.00.0364 (VC 2005).]) fi # Add flags if necessary @@ -405,6 +409,7 @@ case "$target" in esac AC_SUBST(MIDL_FLAGS) +AC_SUBST(_MSC_VER) if test -n "$_WIN32_MSVC"; then SKIP_PATH_CHECKS=1 diff --git a/mozilla/embedding/browser/activex/src/common/Makefile.in b/mozilla/embedding/browser/activex/src/common/Makefile.in index 1b5937c236f..0bc5c76b6dd 100644 --- a/mozilla/embedding/browser/activex/src/common/Makefile.in +++ b/mozilla/embedding/browser/activex/src/common/Makefile.in @@ -94,6 +94,6 @@ EXPORTS = \ # static lib. FORCE_STATIC_LIB = 1 -include $(topsrcdir)/config/rules.mk +ENABLE_CXX_EXCEPTIONS = 1 -CXXFLAGS += -GX +include $(topsrcdir)/config/rules.mk diff --git a/mozilla/embedding/browser/activex/src/control/Makefile.in b/mozilla/embedding/browser/activex/src/control/Makefile.in index 67103902cc3..0e713713cd1 100644 --- a/mozilla/embedding/browser/activex/src/control/Makefile.in +++ b/mozilla/embedding/browser/activex/src/control/Makefile.in @@ -114,9 +114,11 @@ OS_LIBS += \ MIDL_GENERATED_FILES = MozillaControl_i.c MozillaControl.h GARBAGE += $(DEFFILE) $(MIDL_GENERATED_FILES) done_gen +ENABLE_CXX_EXCEPTIONS = 1 + include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "WIN32" /GX /U "ClientWallet" +CXXFLAGS += /D "WIN32" /U "ClientWallet" LDFLAGS += -SUBSYSTEM:windows /DLL ifdef MOZ_NO_DEBUG_RTL diff --git a/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in index e1a2e6c0e24..be61edfa0fb 100644 --- a/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in +++ b/mozilla/embedding/browser/activex/src/control_kicker/Makefile.in @@ -61,10 +61,12 @@ OS_LIBS += \ uuid.lib \ shell32.lib \ $(NULL) + +ENABLE_CXX_EXCEPTIONS = 1 include $(topsrcdir)/config/rules.mk -CXXFLAGS += /D "WIN32" /GX /GF /MT /O1 +CXXFLAGS += /D "WIN32" /GF /MT /O1 libs:: ifdef MOZ_ACTIVEX_REGISTRATION diff --git a/mozilla/embedding/browser/activex/src/plugin/Makefile.in b/mozilla/embedding/browser/activex/src/plugin/Makefile.in index 1cc85bc1521..ccbc09533b1 100644 --- a/mozilla/embedding/browser/activex/src/plugin/Makefile.in +++ b/mozilla/embedding/browser/activex/src/plugin/Makefile.in @@ -228,9 +228,9 @@ endif SRCS_IN_OBJDIR = 1 -include $(topsrcdir)/config/rules.mk +ENABLE_CXX_EXCEPTIONS = 1 -CXXFLAGS += -GX +include $(topsrcdir)/config/rules.mk ifdef MOZ_ACTIVEX_PLUGIN_LIVCONNECT copy-sources: $(addprefix $(MOZCTLSRC)/,$(_CONTROL_CPPSRCS)) diff --git a/mozilla/extensions/xmlextras/tests/Makefile.in b/mozilla/extensions/xmlextras/tests/Makefile.in index e951ffb94e7..598e452ab78 100644 --- a/mozilla/extensions/xmlextras/tests/Makefile.in +++ b/mozilla/extensions/xmlextras/tests/Makefile.in @@ -65,10 +65,7 @@ LIBS = \ $(XPCOM_LIBS) \ $(NSPR_LIBS) \ $(NULL) + +ENABLE_CXX_EXCEPTIONS = 1 include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),WINNT) -CXXFLAGS += -GX -endif - diff --git a/mozilla/js/src/Makefile.in b/mozilla/js/src/Makefile.in index 7e6469fc697..df8fe888a2c 100644 --- a/mozilla/js/src/Makefile.in +++ b/mozilla/js/src/Makefile.in @@ -246,7 +246,11 @@ endif # Prevent floating point errors caused by VC++ optimizations ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_) +ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) CFLAGS += /Op +else +CFLAGS += /fp:precise +endif endif # WINNT ifeq ($(OS_ARCH),FreeBSD) diff --git a/mozilla/js/src/xpconnect/src/Makefile.in b/mozilla/js/src/xpconnect/src/Makefile.in index e97d7f5e8cf..0f6060148fb 100644 --- a/mozilla/js/src/xpconnect/src/Makefile.in +++ b/mozilla/js/src/xpconnect/src/Makefile.in @@ -142,6 +142,7 @@ endif ifeq ($(OS_ARCH),WINNT) ifndef GNU_CXX +ifeq (,$(filter-out 1200 1300 1310,$(_MSC_VER))) # whole program optimization and precompiled headers are incompatible ifeq (,$(findstring GL,$(CXXFLAGS))) # use pre-compiled headers @@ -151,4 +152,5 @@ CXXFLAGS += -YX -Fp$(LIBRARY_NAME).pch endif endif endif +endif diff --git a/mozilla/mailnews/import/Makefile.in b/mozilla/mailnews/import/Makefile.in index 0f2e1d80553..29058cae4fc 100644 --- a/mozilla/mailnews/import/Makefile.in +++ b/mozilla/mailnews/import/Makefile.in @@ -55,12 +55,10 @@ endif ifeq ($(OS_ARCH),WINNT) DIRS += eudora -ifneq ($(_MSC_VER),1100) ifndef GNU_CC DIRS += oexpress outlook endif endif -endif ifdef MOZ_STATIC_MAIL_BUILD DIRS += build diff --git a/mozilla/mailnews/import/build/Makefile.in b/mozilla/mailnews/import/build/Makefile.in index c6ccd8e8c47..228a959f44e 100644 --- a/mozilla/mailnews/import/build/Makefile.in +++ b/mozilla/mailnews/import/build/Makefile.in @@ -75,12 +75,10 @@ endif ifeq ($(OS_ARCH),WINNT) REQUIRES += impEudra -ifneq ($(_MSC_VER),1100) ifndef GNU_CC REQUIRES += importOE impOutlk -endif endif endif @@ -102,12 +100,10 @@ endif ifeq ($(OS_ARCH),WINNT) SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)impEudra_s.$(LIB_SUFFIX) -ifneq ($(_MSC_VER),1100) ifndef GNU_CC SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)importOE_s.$(LIB_SUFFIX) SHARED_LIBRARY_LIBS += $(DIST)/lib/$(LIB_PREFIX)impOutlk_s.$(LIB_SUFFIX) endif -endif endif diff --git a/mozilla/modules/libjar/standalone/Makefile.in b/mozilla/modules/libjar/standalone/Makefile.in index 451b95b6974..e974ccd3b4a 100644 --- a/mozilla/modules/libjar/standalone/Makefile.in +++ b/mozilla/modules/libjar/standalone/Makefile.in @@ -66,7 +66,7 @@ endif GARBAGE += $(MODULES_STANDALONE_LCPPSRCS) $(wildcard *.$(OBJ_SUFFIX)) ifeq ($(OS_ARCH),WINNT) -USE_NON_MT_LIBS=1 +USE_STATIC_LIBS=1 GARBAGE += $(addprefix $(srcdir)/,$(MODULES_STANDALONE_LCPPSRCS)) endif diff --git a/mozilla/modules/libreg/standalone/Makefile.in b/mozilla/modules/libreg/standalone/Makefile.in index 62b9485e785..24eaffbb2a5 100644 --- a/mozilla/modules/libreg/standalone/Makefile.in +++ b/mozilla/modules/libreg/standalone/Makefile.in @@ -53,7 +53,7 @@ REQUIRES = macmorefiles endif ifeq ($(OS_ARCH),WINNT) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 endif CSRCS = $(MODULES_LIBREG_SRC_LCSRCS) diff --git a/mozilla/modules/plugin/base/src/Makefile.in b/mozilla/modules/plugin/base/src/Makefile.in index 3c05dec3036..66e755d2de9 100644 --- a/mozilla/modules/plugin/base/src/Makefile.in +++ b/mozilla/modules/plugin/base/src/Makefile.in @@ -140,14 +140,11 @@ ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT))) EXTRA_DSO_LDOPTS += $(TK_LIBS) endif +ENABLE_CXX_EXCEPTIONS = 1 + include $(topsrcdir)/config/rules.mk ifeq ($(OS_ARCH),WINNT) -ifdef GNU_CC -CXXFLAGS += -fexceptions -else -CXXFLAGS += -GX -endif OS_LIBS += $(call EXPAND_LIBNAME,version) endif diff --git a/mozilla/modules/plugin/samples/default/windows/Makefile.in b/mozilla/modules/plugin/samples/default/windows/Makefile.in index 1d911f54483..4071a8cc43c 100644 --- a/mozilla/modules/plugin/samples/default/windows/Makefile.in +++ b/mozilla/modules/plugin/samples/default/windows/Makefile.in @@ -76,14 +76,13 @@ FORCE_USE_PIC = 1 NO_DIST_INSTALL = 1 NO_INSTALL = 1 +ENABLE_CXX_EXCEPTIONS = 1 + include $(topsrcdir)/config/rules.mk _OS_LIBS = version ifdef GNU_CC -CXXFLAGS += -fexceptions _OS_LIBS += gdi32 -else -CXXFLAGS += -GX endif OS_LIBS += $(call EXPAND_LIBNAME,$(_OS_LIBS)) diff --git a/mozilla/modules/zlib/standalone/Makefile.in b/mozilla/modules/zlib/standalone/Makefile.in index bfae535e573..7d92f5f8b1e 100644 --- a/mozilla/modules/zlib/standalone/Makefile.in +++ b/mozilla/modules/zlib/standalone/Makefile.in @@ -38,7 +38,7 @@ FORCE_STATIC_LIB = 1 SRCS_IN_OBJDIR = 1 ifeq ($(OS_ARCH),WINNT) -USE_NON_MT_LIBS=1 +USE_STATIC_LIBS=1 endif ifeq ($(OS_ARCH),OS2) diff --git a/mozilla/toolkit/mozapps/installer/windows/wizard/setup/Makefile.in b/mozilla/toolkit/mozapps/installer/windows/wizard/setup/Makefile.in index 1d528950cf6..33a5425317c 100644 --- a/mozilla/toolkit/mozapps/installer/windows/wizard/setup/Makefile.in +++ b/mozilla/toolkit/mozapps/installer/windows/wizard/setup/Makefile.in @@ -40,7 +40,7 @@ EXTRA_DSO_LIBS = \ xpnet_s \ $(NULL) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CSRCS = \ dialogs.c \ diff --git a/mozilla/toolkit/mozapps/installer/windows/wizard/setuprsc/Makefile.in b/mozilla/toolkit/mozapps/installer/windows/wizard/setuprsc/Makefile.in index c40e9be754b..3f389ab7035 100644 --- a/mozilla/toolkit/mozapps/installer/windows/wizard/setuprsc/Makefile.in +++ b/mozilla/toolkit/mozapps/installer/windows/wizard/setuprsc/Makefile.in @@ -30,7 +30,7 @@ MODULE = setuprsc LIBRARY_NAME = setuprsc RESFILE = setuprsc.res -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 diff --git a/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/Makefile.in b/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/Makefile.in index 9b5b641c3c6..463bc9c7e42 100644 --- a/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/Makefile.in +++ b/mozilla/toolkit/mozapps/installer/windows/wizard/uninstall/Makefile.in @@ -31,7 +31,7 @@ PROGRAM = uninstall$(BIN_SUFFIX) RESFILE = uninstall.res REQUIRES = $(ZLIB_REQUIRES) EXTRA_DSO_LIBS = mozz_s -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 EXPORTS = logkeys.h diff --git a/mozilla/widget/src/windows/Makefile.in b/mozilla/widget/src/windows/Makefile.in index 547fd363cb7..80fdcc74b9e 100644 --- a/mozilla/widget/src/windows/Makefile.in +++ b/mozilla/widget/src/windows/Makefile.in @@ -103,13 +103,9 @@ GARBAGE += L_Ienumfe.cpp $(srcdir)/L_Ienumfe.cpp SRCS_IN_OBJDIR = 1 -include $(topsrcdir)/config/rules.mk +ENABLE_CXX_EXCEPTIONS = 1 -ifdef GNU_CC -CXXFLAGS += -fexceptions -else -CXXFLAGS += -GX -endif +include $(topsrcdir)/config/rules.mk # Silly case-insensitive fs export:: IENUMFE.CPP diff --git a/mozilla/xpcom/obsolete/nsFileStream.h b/mozilla/xpcom/obsolete/nsFileStream.h index b0cd5e8af52..a9a28ee58bb 100644 --- a/mozilla/xpcom/obsolete/nsFileStream.h +++ b/mozilla/xpcom/obsolete/nsFileStream.h @@ -146,8 +146,8 @@ class nsIFileSpec; // Unix currently does not support iostreams at all. Their compilers do not support // ANSI C++, or even ARM C++. // -// Windows supports them, but only if you turn on the -GX compile flag, to support -// exceptions. +// Windows supports them, but only if you turn on the -GX (VC5-VC7.x) or -EHsc (VC8+) +// compile flag, to support exceptions. // Catch 22. #define NS_USE_PR_STDIO diff --git a/mozilla/xpcom/tests/Makefile.in b/mozilla/xpcom/tests/Makefile.in index 30e08f4f943..c7de49bc76b 100644 --- a/mozilla/xpcom/tests/Makefile.in +++ b/mozilla/xpcom/tests/Makefile.in @@ -94,6 +94,8 @@ ifeq ($(OS_ARCH)$(OS_RELEASE),FreeBSD2) LIBS += -lpcap endif +ENABLE_CXX_EXCEPTIONS = 1 + include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ @@ -101,14 +103,6 @@ LOCAL_INCLUDES = \ -I$(srcdir)/services \ $(NULL) -ifeq ($(OS_ARCH),WINNT) -ifdef GNU_CXX -CXXFLAGS += -fexceptions -else -CXXFLAGS += -GX -endif -endif - libs:: $(INSTALL) $(srcdir)/test.properties $(DIST)/bin/res diff --git a/mozilla/xpinstall/cleanup/Makefile.in b/mozilla/xpinstall/cleanup/Makefile.in index a670db034fd..ead218f5282 100644 --- a/mozilla/xpinstall/cleanup/Makefile.in +++ b/mozilla/xpinstall/cleanup/Makefile.in @@ -63,7 +63,7 @@ else ifeq ($(OS_ARCH),WINNT) CPPSRCS += InstallCleanupWin.cpp MOZ_WINCONSOLE = 0 -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 else CPPSRCS += InstallCleanupUnix.cpp endif diff --git a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in index f647c6d592c..a3c365a6353 100644 --- a/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in +++ b/mozilla/xpinstall/wizard/libxpnet/src/Makefile.in @@ -62,7 +62,7 @@ CPPSRCS = \ FORCE_STATIC_LIB = 1 ifeq ($(OS_ARCH),WINNT) -USE_NON_MT_LIBS=1 +USE_STATIC_LIBS=1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in b/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in index 467079c4673..29e48870fd0 100644 --- a/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in +++ b/mozilla/xpinstall/wizard/libxpnet/test/Makefile.in @@ -52,7 +52,7 @@ LIBS = -lxpnet_s ifeq ($(OS_ARCH),WINNT) MAPFILE = TestLibxpnet.map -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in index a615249b327..17569ac27dd 100644 --- a/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/nsinstall/Makefile.in @@ -44,7 +44,6 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = stubinstall$(BIN_SUFFIX) RESFILE = stubinstall.res -USE_NON_MT_LIBS = 1 USE_STATIC_LIBS = 1 CPPSRCS = \ diff --git a/mozilla/xpinstall/wizard/os2/setup/Makefile.in b/mozilla/xpinstall/wizard/os2/setup/Makefile.in index 2a82f7e9e50..051264faac2 100644 --- a/mozilla/xpinstall/wizard/os2/setup/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/setup/Makefile.in @@ -56,7 +56,6 @@ EXTRA_DSO_LIBS = \ xpnet_s \ $(NULL) -USE_NON_MT_LIBS = 1 USE_STATIC_LIBS = 1 CSRCS = \ diff --git a/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in b/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in index 7f3570d2a21..25566ff4386 100644 --- a/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/setuprsc/Makefile.in @@ -46,7 +46,6 @@ MODULE = setuprsc LIBRARY_NAME = setuprsc RESFILE = setuprsc.res -USE_NON_MT_LIBS = 1 USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 diff --git a/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in b/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in index 6edfc9d5d4e..ba0c97a58f8 100644 --- a/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in +++ b/mozilla/xpinstall/wizard/os2/uninstall/Makefile.in @@ -47,7 +47,6 @@ PROGRAM = uninstall$(BIN_SUFFIX) RESFILE = uninstall.res REQUIRES = $(ZLIB_REQUIRES) EXTRA_DSO_LIBS = mozz_s -USE_NON_MT_LIBS = 1 USE_STATIC_LIBS = 1 EXPORTS = logkeys.h diff --git a/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in b/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in index 9de761210d4..961d6ce57a0 100644 --- a/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/GetShortPathName/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = GetShortPathName$(BIN_SUFFIX) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CSRCS = GetShortPathName.c diff --git a/mozilla/xpinstall/wizard/windows/ds32/Makefile.in b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in index 2cadad25fe2..04e6d1c02d2 100644 --- a/mozilla/xpinstall/wizard/windows/ds32/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/ds32/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = ds32$(BIN_SUFFIX) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CPPSRCS = ds32.cpp diff --git a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in index 20b822bfb3e..7b7b1fc4841 100644 --- a/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsinstall/Makefile.in @@ -46,7 +46,7 @@ PROGRAM = nsinstall$(BIN_SUFFIX) RESFILE = nsinstall.res REQUIRES = $(ZLIB_REQUIRES) EXTRA_DSO_LIBS = mozz_s -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CPPSRCS = nsinstall.cpp diff --git a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in index 2941a98ec01..146549aa959 100644 --- a/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/nsztool/Makefile.in @@ -45,7 +45,7 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = nsztool$(BIN_SUFFIX) REQUIRES = $(ZLIB_REQUIRES) EXTRA_DSO_LIBS = mozz_s -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CSRCS = nsztool.c diff --git a/mozilla/xpinstall/wizard/windows/palmsync/Makefile.in b/mozilla/xpinstall/wizard/windows/palmsync/Makefile.in index 26b67897702..aa6e4eaae82 100644 --- a/mozilla/xpinstall/wizard/windows/palmsync/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/palmsync/Makefile.in @@ -46,7 +46,7 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = PalmSyncInstall$(BIN_SUFFIX) RESFILE = PalmSyncInstall.res -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 LOCAL_INCLUDES += -I$(PALM_CDK_INC) \ $(NULL) diff --git a/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in index 3b4308c5be0..8c4f1735cae 100644 --- a/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/ren8dot3/Makefile.in @@ -44,7 +44,7 @@ include $(DEPTH)/config/autoconf.mk PROGRAM = ren8dot3$(BIN_SUFFIX) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CSRCS = ren8dot3.c diff --git a/mozilla/xpinstall/wizard/windows/setup/Makefile.in b/mozilla/xpinstall/wizard/windows/setup/Makefile.in index 537a58b7366..2ee84b7fea3 100644 --- a/mozilla/xpinstall/wizard/windows/setup/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/setup/Makefile.in @@ -56,7 +56,7 @@ EXTRA_DSO_LIBS = \ xpnet_s \ $(NULL) -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 CSRCS = \ dialogs.c \ diff --git a/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in index 1a9c87f6e5e..3a6b5d0678e 100644 --- a/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/setuprsc/Makefile.in @@ -46,7 +46,7 @@ MODULE = setuprsc LIBRARY_NAME = setuprsc RESFILE = setuprsc.res -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 NO_DIST_INSTALL = 1 diff --git a/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in index fa5d932c5f7..2baddffdb63 100644 --- a/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in +++ b/mozilla/xpinstall/wizard/windows/uninstall/Makefile.in @@ -47,7 +47,7 @@ PROGRAM = uninstall$(BIN_SUFFIX) RESFILE = uninstall.res REQUIRES = $(ZLIB_REQUIRES) EXTRA_DSO_LIBS = mozz_s -USE_NON_MT_LIBS = 1 +USE_STATIC_LIBS = 1 EXPORTS = logkeys.h