summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwtc%netscape.com <devnull@localhost>1998-09-23 06:31:53 +0000
committerwtc%netscape.com <devnull@localhost>1998-09-23 06:31:53 +0000
commitcd6a1170fdeabe9194da0f3d571eb2a259193ea0 (patch)
tree2e4e32222c2275cb6f7399968a3ca1709f6053c7
parent82f9b33577dd55e051410e619843b783ef5e6dda (diff)
downloadnspr-hg-cd6a1170fdeabe9194da0f3d571eb2a259193ea0.tar.gz
Restored the MOZ_PROF and GLOWCODE stuff.
-rw-r--r--config/WIN32.mk33
1 files changed, 13 insertions, 20 deletions
diff --git a/config/WIN32.mk b/config/WIN32.mk
index da2b42ab..138755fe 100644
--- a/config/WIN32.mk
+++ b/config/WIN32.mk
@@ -51,31 +51,20 @@ DLL_SUFFIX = dll
OS_CFLAGS = -W3 -nologo -GF -Gy
-ifdef MOZ_PROF
-
-#
-# compile with debug symbols, but without DEBUG code and ASSERTs
-#
-ifdef USE_DEBUG_RTL
-OS_CFLAGS += -MDd
-else
-OS_CFLAGS += -MD
-endif
-OPTIMIZER = -Od -Z7
-#OPTIMIZER = -Zi -Fd$(OBJDIR)/ -Od
-DEFINES = -UDEBUG -U_DEBUG -DNDEBUG
-DLLFLAGS = -DEBUG -DEBUGTYPE:CV -OUT:"$@"
-OBJDIR_TAG = _DBG
-LDFLAGS = -DEBUG -DEBUGTYPE:CV
-
-else
-
ifdef BUILD_OPT
OS_CFLAGS += -MD
OPTIMIZER = -O2
DEFINES = -UDEBUG -U_DEBUG -DNDEBUG
DLLFLAGS = -OUT:"$@"
OBJDIR_TAG = _OPT
+
+# Add symbolic information for use by a profiler
+ifdef MOZ_PROF
+OPTIMIZER += -Z7
+DLLFLAGS += -DEBUG -DEBUGTYPE:CV
+LDFLAGS += -DEBUG -DEBUGTYPE:CV
+endif
+
else
#
# Define USE_DEBUG_RTL if you want to use the debug runtime library
@@ -89,11 +78,15 @@ endif
OPTIMIZER = -Od -Z7
#OPTIMIZER = -Zi -Fd$(OBJDIR)/ -Od
DEFINES = -DDEBUG -D_DEBUG -UNDEBUG
+
DLLFLAGS = -DEBUG -DEBUGTYPE:CV -OUT:"$@"
+ifdef GLOWCODE
+DLLFLAGS = -DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"
+endif
+
OBJDIR_TAG = _DBG
LDFLAGS = -DEBUG -DEBUGTYPE:CV
endif
-endif
DEFINES += -DWIN32