diff options
| author | wchang0222%aol.com <devnull@localhost> | 2004-11-08 02:50:18 +0000 |
|---|---|---|
| committer | wchang0222%aol.com <devnull@localhost> | 2004-11-08 02:50:18 +0000 |
| commit | 390e3819817e00999a863a0a1cd1879c93378985 (patch) | |
| tree | 34c55ed573dcc61516d4cf5a6a7d7fd39d295227 | |
| parent | 23dc99d81061a58d6ac585e5cb2bde7d16167ad5 (diff) | |
| download | nspr-hg-390e3819817e00999a863a0a1cd1879c93378985.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. The patch is contributed by Stephen Walker
<sdwalker@myrealbox.com>. r=wtc.
Modified Files:
Tag: NSPRPUB_PRE_4_2_CLIENT_BRANCH
pr/src/cplus/tests/Makefile.in pr/src/misc/Makefile.in
| -rw-r--r-- | pr/src/cplus/tests/Makefile.in | 2 | ||||
| -rw-r--r-- | pr/src/misc/Makefile.in | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pr/src/cplus/tests/Makefile.in b/pr/src/cplus/tests/Makefile.in index e786d585..1ef20697 100644 --- a/pr/src/cplus/tests/Makefile.in +++ b/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/pr/src/misc/Makefile.in b/pr/src/misc/Makefile.in index 2ac8e257..55791215 100644 --- a/pr/src/misc/Makefile.in +++ b/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 # |