Made usage of crt debug conditional on using the debug RTL

git-svn-id: svn://10.0.0.236/trunk@3216 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp 1998-06-04 17:46:41 +00:00
parent 276ebcf945
commit c487af9554
2 changed files with 16 additions and 9 deletions

View File

@ -30,14 +30,15 @@ MISCDEP= \
$(DIST)\lib\libplc21.lib
OBJS = \
.\$(OBJDIR)\winmain.obj \
.\$(OBJDIR)\nsViewer.obj \
.\$(OBJDIR)\JSConsole.obj \
.\$(OBJDIR)\nsDocLoader.obj \
OBJS = \
.\$(OBJDIR)\winmain.obj \
.\$(OBJDIR)\nsViewer.obj \
.\$(OBJDIR)\JSConsole.obj \
.\$(OBJDIR)\nsDocLoader.obj \
$(NULL)
LINCS=-I$(PUBLIC)\raptor -I$(PUBLIC)\xpcom -I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib
MYLIBS= \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\raptorgfx.lib \
@ -58,6 +59,10 @@ LLIBS= $(MYLIBS) \
include <$(DEPTH)\config\rules.mak>
!ifdef MOZ_NO_DEBUG_RTL
OS_CFLAGS = $(OS_CFLAGS) -DMOZ_NO_DEBUG_RTL
!endif
install:: $(PROGRAM)
$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
$(MAKE_INSTALL) samples\test0.html $(DIST)\bin\res\samples
@ -68,10 +73,10 @@ install:: $(PROGRAM)
$(MAKE_INSTALL) samples\test5.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test6.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test7.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8siz.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8sca.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8tab.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8siz.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8sca.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\test8tab.html $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\raptor.jpg $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\Anieyes.gif $(DIST)\bin\res\samples
$(MAKE_INSTALL) samples\gear1.gif $(DIST)\bin\res\samples

View File

@ -91,9 +91,11 @@ void DestroyConsole()
void nsWin32Viewer::CrtSetDebug(PRUint32 aNewFlags)
{
#ifndef MOZ_NO_DEBUG_RTL
int oldFlags = _CrtSetDbgFlag(_CRTDBG_REPORT_FLAG);
_CrtSetDbgFlag(aNewFlags);
printf("Note: crt flags: old=%x new=%x\n", oldFlags, aNewFlags);
#endif
}