diff options
| author | wchang0222%aol.com <devnull@localhost> | 2004-11-08 02:52:56 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2004-11-08 02:52:56 +0000 |
| commit | 75d702b469df494adc238fa4ca77e62244e859ed (patch) | |
| tree | 34c55ed573dcc61516d4cf5a6a7d7fd39d295227 /lib | |
| parent | 8f5eb9e2b20a3d77e121d041ae8ec5a9a0c33c53 (diff) | |
| download | nspr-hg-75d702b469df494adc238fa4ca77e62244e859ed.tar.gz | |
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 <sdwalker@myrealbox.com>.
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
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/msgc/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/prstreams/tests/testprstrm/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | lib/tests/windows/makefile | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/msgc/tests/Makefile.in b/lib/msgc/tests/Makefile.in index 23518e15..609bdf6b 100644 --- a/lib/msgc/tests/Makefile.in +++ b/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/lib/prstreams/tests/testprstrm/Makefile.in b/lib/prstreams/tests/testprstrm/Makefile.in index 1b682ff8..e1405fd0 100644 --- a/lib/prstreams/tests/testprstrm/Makefile.in +++ b/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/lib/tests/Makefile.in b/lib/tests/Makefile.in index 8c3dc9a8..18917ad1 100644 --- a/lib/tests/Makefile.in +++ b/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/lib/tests/windows/makefile b/lib/tests/windows/makefile index 1cf2c079..c6106a6a 100644 --- a/lib/tests/windows/makefile +++ b/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 |