From 009e14e1f42097e826713182f71047ab6303b19e Mon Sep 17 00:00:00 2001 From: "wchang0222%aol.com" Date: Mon, 8 Nov 2004 02:52:56 +0000 Subject: [PATCH] Bugzilla bug 249782: make NSPR compile with Microsoft Visual Studio 2005. The -DEBUGTYPE flag is no longer supported. Since -DEBUGTYPE:CV is the default, we simply delete it. We added support for VC 5.0 (MSC_VER=1100) back. The patch is contributed by Stephen Walker . r=wtc. Modified Files: configure configure.in config/rules.mk lib/msgc/tests/Makefile.in lib/prstreams/tests/testprstrm/Makefile.in lib/tests/Makefile.in lib/tests/windows/makefile pr/src/cplus/tests/Makefile.in pr/src/misc/Makefile.in tools/Makefile.in git-svn-id: svn://10.0.0.236/trunk@165104 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/config/rules.mk | 2 +- mozilla/nsprpub/configure | 6 +++--- mozilla/nsprpub/configure.in | 6 +++--- mozilla/nsprpub/lib/msgc/tests/Makefile.in | 2 +- mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in | 2 +- mozilla/nsprpub/lib/tests/Makefile.in | 2 +- mozilla/nsprpub/lib/tests/windows/makefile | 4 ++-- mozilla/nsprpub/pr/src/cplus/tests/Makefile.in | 2 +- mozilla/nsprpub/pr/src/misc/Makefile.in | 4 ++++ mozilla/nsprpub/tools/Makefile.in | 2 +- 10 files changed, 18 insertions(+), 14 deletions(-) diff --git a/mozilla/nsprpub/config/rules.mk b/mozilla/nsprpub/config/rules.mk index bba50ee75fe..e6f6b6b5042 100644 --- a/mozilla/nsprpub/config/rules.mk +++ b/mozilla/nsprpub/config/rules.mk @@ -140,7 +140,7 @@ ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) TARGETS = $(LIBRARY) $(SHARED_LIBRARY) $(IMPORT_LIBRARY) ifndef BUILD_OPT ifdef MSC_VER -ifneq ($(MSC_VER),1200) +ifneq (,$(filter-out 1100 1200,$(MSC_VER))) TARGETS += $(SHARED_LIB_PDB) endif endif diff --git a/mozilla/nsprpub/configure b/mozilla/nsprpub/configure index 35e33a14cc6..6107c5567a2 100755 --- a/mozilla/nsprpub/configure +++ b/mozilla/nsprpub/configure @@ -3824,8 +3824,8 @@ EOF fi if test -n "$MOZ_DEBUG"; then - DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" - LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" + DLLFLAGS="$DLLFLAGS -DEBUG" + LDFLAGS="$LDFLAGS -DEBUG" fi if test "$OS_TARGET" = "WINNT"; then @@ -3877,7 +3877,7 @@ EOF fi OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS" - if test "$MSC_VER" = "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then + if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE" fi diff --git a/mozilla/nsprpub/configure.in b/mozilla/nsprpub/configure.in index 832c2412305..5bcb8e0e93d 100644 --- a/mozilla/nsprpub/configure.in +++ b/mozilla/nsprpub/configure.in @@ -1301,8 +1301,8 @@ case "$target" in fi if test -n "$MOZ_DEBUG"; then - DLLFLAGS="$DLLFLAGS -DEBUG -DEBUGTYPE:CV" - LDFLAGS="$LDFLAGS -DEBUG -DEBUGTYPE:CV" + DLLFLAGS="$DLLFLAGS -DEBUG" + LDFLAGS="$LDFLAGS -DEBUG" fi if test "$OS_TARGET" = "WINNT"; then @@ -1342,7 +1342,7 @@ case "$target" in fi OS_DLLFLAGS="-nologo -DLL -SUBSYSTEM:WINDOWS" - if test "$MSC_VER" = "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then + if test "$MSC_VER" -le "1200" -a -z "$MOZ_DEBUG_SYMBOLS"; then OS_DLLFLAGS="$OS_DLLFLAGS -PDB:NONE" fi diff --git a/mozilla/nsprpub/lib/msgc/tests/Makefile.in b/mozilla/nsprpub/lib/msgc/tests/Makefile.in index 23518e15d76..609bdf6be90 100644 --- a/mozilla/nsprpub/lib/msgc/tests/Makefile.in +++ b/mozilla/nsprpub/lib/msgc/tests/Makefile.in @@ -84,7 +84,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPLC = $(dist_libdir)/plc$(NSPR_VERSION).lib LIBGC= $(dist_libdir)/msgc$(GC_VERSION).lib else - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) LIBPLC = $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) LIBGC= $(dist_libdir)/libmsgc$(GC_VERSION).$(LIB_SUFFIX) diff --git a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in index 1b682ff8d1b..e1405fd0b3e 100644 --- a/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in +++ b/mozilla/nsprpub/lib/prstreams/tests/testprstrm/Makefile.in @@ -79,7 +79,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).lib else - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) LIBPRSTRMS = $(dist_libdir)/prstrms$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) diff --git a/mozilla/nsprpub/lib/tests/Makefile.in b/mozilla/nsprpub/lib/tests/Makefile.in index 8c3dc9a870d..18917ad1ec8 100644 --- a/mozilla/nsprpub/lib/tests/Makefile.in +++ b/mozilla/nsprpub/lib/tests/Makefile.in @@ -88,7 +88,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).lib else - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) diff --git a/mozilla/nsprpub/lib/tests/windows/makefile b/mozilla/nsprpub/lib/tests/windows/makefile index 1cf2c07977d..c6106a6ab91 100644 --- a/mozilla/nsprpub/lib/tests/windows/makefile +++ b/mozilla/nsprpub/lib/tests/windows/makefile @@ -49,7 +49,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).lib LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).lib else - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO ifeq ($(OS_TARGET), WIN95) LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).$(LIB_SUFFIX) LIBPLC= $(DIST)/lib/plc$(MOD_VERSION).$(LIB_SUFFIX) @@ -64,7 +64,7 @@ endif TARGETS = $(OBJDIR)/winevent.exe OS_CFLAGS = $(OS_EXE_CFLAGS) -LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO +LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO LDFLAGS += -DEBUG LIBPR += $(LIBPLDS) LIBPR += kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib diff --git a/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in b/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in index e786d5850b6..1ef206971f4 100644 --- a/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in +++ b/mozilla/nsprpub/pr/src/cplus/tests/Makefile.in @@ -132,7 +132,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).lib LIBPL = $(dist_libdir)/plc$(MOD_MAJOR_VERSION).lib else - LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO + LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO LIBPR = $(dist_libdir)/libnspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) LIBPL = $(dist_libdir)/libplc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) endif diff --git a/mozilla/nsprpub/pr/src/misc/Makefile.in b/mozilla/nsprpub/pr/src/misc/Makefile.in index 2ac8e2578e1..55791215637 100644 --- a/mozilla/nsprpub/pr/src/misc/Makefile.in +++ b/mozilla/nsprpub/pr/src/misc/Makefile.in @@ -93,7 +93,11 @@ include $(topsrcdir)/config/rules.mk ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) $(OBJDIR)/prdtoa.$(OBJ_SUFFIX): prdtoa.c @$(MAKE_OBJDIR) +ifeq (,$(filter-out 1100 1200 1300 1310,$(MSC_VER))) $(CC) -Fo$@ -c $(CFLAGS) -Op $(call abspath,$<) +else + $(CC) -Fo$@ -c $(CFLAGS) -fp:precise $(call abspath,$<) +endif endif # diff --git a/mozilla/nsprpub/tools/Makefile.in b/mozilla/nsprpub/tools/Makefile.in index eb18de01aaf..c01b0a648ff 100644 --- a/mozilla/nsprpub/tools/Makefile.in +++ b/mozilla/nsprpub/tools/Makefile.in @@ -83,7 +83,7 @@ ifeq ($(OS_TARGET), WIN16) LIBPR = $(dist_libdir)/nspr$(NSPR_VERSION).lib LIBPLC= $(dist_libdir)/plc$(NSPR_VERSION).lib else -LDOPTS = -NOLOGO -DEBUG -DEBUGTYPE:CV -INCREMENTAL:NO +LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO LIBPR = $(dist_libdir)/libnspr$(NSPR_VERSION).$(LIB_SUFFIX) LIBPLC= $(dist_libdir)/libplc$(NSPR_VERSION).$(LIB_SUFFIX) endif