Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-17 22:32:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

glowcode. bug 299200 a:don.

Browse Source
This commit is contained in:
danm 1998-07-09 16:33:15 +00:00
parent 4f5baff7ce
commit 30f8c8b987
29 changed files with 148 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/wincom/dllreg/makefile.win
View File

@ -21,7 +21,11 @@ MAPFILE =$(EXENAME).map
MAKE_OBJ_TYPE = EXE
!if "$(MOZ_BITS)" == "32"
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=ole32.lib $(GLOWDIR)\glowcode.lib
!else
LLIBS=ole32.lib
!endif
!else
LLIBS=ole2.lib
!endif

3
cmd/winfe/edtrcdll/src/makefile.win
View File

@ -30,6 +30,9 @@ OBJS = $(OBJS) .\$(OBJDIR)\imewrp16.obj
!endif
LLIBS = $(DIST)\lib\nsdlg$(MOZ_BITS).lib comdlg32.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
MODULE=edtrcdll
DEPTH=..\..\..\..

37
cmd/winfe/mkfiles32/mozilla.mak
View File

@ -218,6 +218,9 @@ CFLAGS_DEBUG=$(MOZ_DEBUG_FLAG) /Bd /DDEBUG /D_DEBUG $(MOZ_USERDEBUG)\
!endif
!IF "$(MOZ_BITS)"=="32"
/Gm /Gi \
!if defined(GLOWCODE) && defined(GLOWPROF)
/Gh \
!endif
!IF 0 #defined(MOZ_BATCH)
/MDd /Od /Gy /Z7
!else
@ -233,7 +236,11 @@ CFLAGS_DEBUG=$(MOZ_DEBUG_FLAG) /Bd /DDEBUG /D_DEBUG $(MOZ_USERDEBUG)\
RCFLAGS_DEBUG=/DDEBUG
LINKFLAGS_DEBUG= \
!if "$(MOZ_BITS)"=="32"
!ifdef GLOWCODE
/debug /debugtype:both /include:_GlowCode comctl32.lib msvcrtd.lib winmm.lib
!else
/debug /incremental:yes comctl32.lib msvcrtd.lib winmm.lib
!endif
!else
/STACK:$(MOZ_STACK) /ALIGN:128 /PACKC:61440 /SEG:1024 /NOD /PACKD /NOI /ONERROR:NOEXE /CO /MAP /DETAILEDMAP /CHECKEXE /RELOCATIONCHECK /W
!endif
@ -483,11 +490,14 @@ LINK_LIBS= \
$(NGLAYOUT_DIST)\lib\raptorweb.lib \
!endif
!if "$(WINOS)" == "WIN95"
$(DIST)\lib\xpcom$(MOZ_BITS).lib
$(DIST)\lib\xpcom$(MOZ_BITS).lib \
!else
$(DIST)\lib\xpcom$(MOZ_BITS).lib \
$(NULL)
!endif
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \
!endif
$(NULL)
## Specify MFC libs before other libs and before .obj files,
## such that _CrtDumpMemoryLeaks will be called
@ -1748,7 +1758,12 @@ install: \
$(OUTDIR)\editor32.dll \
!ENDIF
!endif
!ELSE
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
!IF EXIST($(DIST)\bin\glowcode.dll)
$(OUTDIR)\glowcode.dll \
!ENDIF
!endif
!ELSE # MOZ_BITS==32 way above
!IFDEF JAVA_OR_OJI
!IF EXIST($(DIST)\bin\npj16$(VERSION_NUMBER).dll)
$(JAVABIN_DIR)\npj16$(VERSION_NUMBER).dll \
@ -1825,7 +1840,7 @@ install: \
$(OUTDIR)\nsldap.dll \
!ENDIF
!endif
!ENDIF
!ENDIF # MOZ_BITS==32 (end of "else" clause)
!if defined(JAVA_OR_OJI)
$(JAVACLS_DIR)\$(JAR_NAME) \
!endif
@ -1883,6 +1898,7 @@ install: \
!ENDIF
!endif
### End NGLayout DLLs
!ifdef EDITOR
!IF EXIST($(SPELLCHK_DATA)\pen4s324.dat)
$(OUTDIR)\spellchk\pen4s324.dat \
@ -2073,7 +2089,12 @@ $(JAVABIN_DIR)\jit32$(VERSION_NUMBER).dll: $(DIST)\bin\jit32$(VERSION_NUMBER).
@IF NOT EXIST "$(JAVABIN_DIR)/$(NULL)" mkdir "$(JAVABIN_DIR)"
@IF EXIST $(DIST)\bin\jit32$(VERSION_NUMBER).dll copy $(DIST)\bin\jit32$(VERSION_NUMBER).dll $(JAVABIN_DIR)\jit32$(VERSION_NUMBER).dll
!ELSE
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
$(OUTDIR)\glowcode.dll: $(DIST)\bin\glowcode.dll
@IF EXIST $(DIST)\bin\glowcode.dll copy $(DIST)\bin\glowcode.dll $(OUTDIR)\glowcode.dll
!endif
!ELSE # (MOZ_BITS==32)
!ifndef NSPR20
$(OUTDIR)\pr16$(VERSION_NUMBER).dll: $(DIST)\bin\pr16$(VERSION_NUMBER).dll
@IF EXIST $(DIST)\bin\pr16$(VERSION_NUMBER).dll copy $(DIST)\bin\pr16$(VERSION_NUMBER).dll $(OUTDIR)\pr16$(VERSION_NUMBER).dll
@ -2151,7 +2172,7 @@ $(JAVABIN_DIR)\zpw16$(VERSION_NUMBER).dll: $(DIST)\bin\zpw16$(VERSION_NUMBER).
$(OUTDIR)\nsinit.exe: $(DIST)\bin\nsinit.exe
@IF EXIST $(DIST)\bin\nsinit.exe copy $(DIST)\bin\nsinit.exe $(OUTDIR)\nsinit.exe
!ENDIF
!ENDIF # (MOZ_BITS==32 (end of ELSE clause))
!if defined(MOZ_CALENDAR)
$(OUTDIR)\cal3240.dll: $(DIST)\bin\cal3240.dll
@ -2298,7 +2319,6 @@ $(OUTDIR)\spellchk\pfn2s311.dat: $(SPELLCHK_DATA)\pfn2s311.dat
@IF NOT EXIST "$(OUTDIR)\spellchk/$(NULL)" mkdir "$(OUTDIR)\spellchk"
@IF EXIST $(SPELLCHK_DATA)\pfn2s311.dat copy $(SPELLCHK_DATA)\pfn2s311.dat $(OUTDIR)\spellchk\pfn2s311.dat
BATCH_BUILD_1: \
BATCH_LIBI18N_C \
BATCH_LIBLAYER_C \
@ -2915,4 +2935,7 @@ ns.zip:
sched32.dll \
xpcom32.dll \
netscape.cfg \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
glowcode.dll \
!endif
moz40p3

3
cmd/winfe/prefs/brpref/src/makefile.win
View File

@ -41,6 +41,9 @@ LLIBS32 = ole32.lib comdlg32.lib shell32.lib uuid.lib
!if "$(_MSC_VER)" != "1100"
LLIBS32 = $(LLIBS32) uuid2.lib
!endif
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS32 = $(LLIBS32) $(GLOWDIR)\glowcode.lib
!endif
!if "$(MOZ_BITS)" == "32"
LLIBS = $(LLIBS) $(LLIBS32)

3
cmd/winfe/prefs/edpref/src/makefile.win
View File

@ -45,6 +45,9 @@ LLIBS32 = ole32.lib comdlg32.lib uuid.lib
!if "$(_MSC_VER)" != "1100"
LLIBS32 = $(LLIBS32) uuid2.lib
!endif
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS32 = $(LLIBS32) $(GLOWDIR)\glowcode.lib
!endif
!if "$(MOZ_BITS)" == "32"
LLIBS = $(LLIBS) $(LLIBS32)

3
cmd/winfe/prefs/nsdlg/src/makefile.win
View File

@ -41,6 +41,9 @@ LLIBS32 = ole32.lib uuid.lib
!if "$(_MSC_VER)" != "1100"
LLIBS32 = $(LLIBS32) uuid2.lib
!endif
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS32 = $(LLIBS32) $(GLOWDIR)\glowcode.lib
!endif
!if "$(MOZ_BITS)" == "32"
LLIBS = $(LLIBS) $(LLIBS32)

3
cmd/winfe/prefs/nsprefui/src/makefile.win
View File

@ -36,6 +36,9 @@ LLIBS32 = ole32.lib uuid.lib
!if "$(_MSC_VER)" != "1100"
LLIBS32 = $(LLIBS32) uuid2.lib
!endif
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS32 = $(LLIBS32) $(GLOWDIR)\glowcode.lib
!endif
!if "$(MOZ_BITS)" == "32"
LLIBS = $(LLIBS) $(LLIBS32)

3
cmd/winfe/xpstrdll/src/makefile.win
View File

@ -60,6 +60,9 @@ CPP_OBJS=.\$(OBJDIR)\xpstrdll.obj
LINCS=-I$(XPDIST)\public\coreincl -I$(XPDIST)\public\nspr \
-I$(XPDIST)\public\security
!endif
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
## Include support for MOZ_LITE/MOZ_MEDIUM
include <$(DEPTH)/config/liteness.mak>

7
config/WIN32
View File

@ -65,7 +65,11 @@ OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE
#
#OPTIMIZER=-Z7 -DDEBUG -UNDEBUG -D_DEBUG -D_CRTDBG_MAP_ALLOC
OPTIMIZER=-Z7 -DDEBUG -UNDEBUG -D_DEBUG
!if defined(GLOWCODE) && "$(MOZ_BITS)"=="32"
OS_LFLAGS=/DEBUG /DEBUGTYPE:BOTH /INCLUDE:_GlowCode /PDB:NONE
!else
OS_LFLAGS=/DEBUG /DEBUGTYPE:CV /PDB:NONE
!endif
!else
#
@ -121,7 +125,8 @@ OS_LIBS=kernel32.lib user32.lib gdi32.lib winmm.lib wsock32.lib advapi32.lib
#// Specify the special flags for creating EXEs
#//
#//------------------------------------------------------------------------
!ifdef SWAPTUNER
!if defined(SWAPTUNER) || (defined(GLOWCODE) && defined(GLOWPROF) && "$(MOZ_BITS)"=="32")
# this seems to get lost
EXE_CFLAGS=/Gh
!else
EXE_CFLAGS=/Gy

3
config/config.mak
View File

@ -215,6 +215,9 @@ include <$(DEPTH)/config/WIN$(MOZ_BITS)>
!ifdef USERNAME
CFLAGS = $(CFLAGS) -DDEBUG_$(USERNAME)
!endif
!if defined(GLOWCODE) && defined(GLOWPROF) && "$(MOZ_BITS)"=="32"
CFLAGS = $(CFLAGS) -Gh
!endif
!endif
#//------------------------------------------------------------------------

4
jpeg/makefile.win
View File

@ -63,6 +63,10 @@ DEFFILE=$(DLLNAME).def
LCFLAGS = -Zi -GM
LINCS = -I$(PUBLIC)/java
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#//------------------------------------------------------------------------
#//
#// Define the files necessary to build the target (ie. OBJS)

4
js/jsj/makefile.win
View File

@ -60,6 +60,10 @@ LLIBS=$(LIBNSPR) $(DIST)\lib\jrt$(MOZ_BITS)$(VERSION_NUMBER).lib \
LLIBS=$(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib
!endif
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#//------------------------------------------------------------------------
#//
#// Define the files necessary to build the target (ie. OBJS)

3
js/src/makefile.win
View File

@ -51,6 +51,9 @@ DEFFILE = $(DLLNAME).def
LLIBS=$(LIBNSPR)
LCFLAGS= $(LCFLAGS) -DEXPORT_JS_API
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#//------------------------------------------------------------------------
#//

3
lib/libi18n/makefile.win
View File

@ -71,6 +71,9 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LINCS=$(LINCS) -I_gen -I$(PUBLIC)\dbm -I$(DEPTH)\include -I$(XPDIST)\applet
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#// End of MOZ_BITS == 32
!endif

4
lib/libi18n/unicode/makefile.win
View File

@ -66,7 +66,9 @@ LIBRARY=.\$(OBJDIR)\$(DLLNAME).lib
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
#//
#//------------------------------------------------------------------------
LLIBS=$(LLIBS)
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
LINCS=$(LINCS) -I_gen -I$(DEPTH)/include -I$(PUBLIC)\dbm -I$(PUBLIC)\img
LCFLAGS = $(LCFLAGS) /Fr$*.sbr
GARBAGE = $(GARBAGE) *.sbr

5
makefile.win
View File

@ -115,6 +115,11 @@ include <$(DEPTH)\config\rules.mak>
#LCFLAGS=-D_USE_PR_DEBUG_MEMORY $(LCFLAGS)
export::
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(MAKE_INSTALL) $(GLOWDIR)\glowcode.dll $(DIST)\bin
!endif
clobber_all::
cd $(DEPTH)
-rd /s /q dist

5
modules/libpref/src/makefile.win
View File

@ -85,7 +85,10 @@ DEFFILE = $(DLLNAME).def
!endif
!else
LLIBS = $(LIBNSPR) $(DIST)\lib\js$(MOZ_BITS)$(VERSION_NUMBER).lib \
$(HASHLIBS)
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \
!endif
$(HASHLIBS)
!endif

4
modules/libreg/src/makefile.win
View File

@ -73,6 +73,10 @@ LIBRARY= .\$(OBJDIR)\$(LIBNAME).lib
LCFLAGS = $(LCFLAGS)
LLIBS = $(LLIBS) $(LIBNSPR)
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#//
#// Win16 places ALL public header files in $(PUBLIC)/win16
#//

4
modules/schedulr/src/makefile.win
View File

@ -49,8 +49,12 @@ LCFLAGS = -DMOZILLA_CLIENT
LLIBS=$(LIBNSPR)
DEFFILE = $(DLLNAME).def
!else
!if defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LIBNSPR) $(GLOWDIR)\glowcode.lib
!else
LLIBS=$(LIBNSPR)
!endif
!endif
#//------------------------------------------------------------------------

4
modules/zlib/src/makefile.win
View File

@ -99,6 +99,10 @@ LINCS=$(LINCS) -I. -I_gen
# clobber and clobber_all will remove the following garbage:
GARBAGE = $(GARBAGE) _gen
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
#//------------------------------------------------------------------------
#//
#// Include the common makefile rules

9
nsprpub/config/WIN32.mk
View File

@ -105,7 +105,16 @@ endif
OPTIMIZER = -Od -Z7
#OPTIMIZER = -Zi -Fd$(OBJDIR)/ -Od
DEFINES = -DDEBUG -D_DEBUG -UNDEBUG
DLLFLAGS = -DEBUG -DEBUGTYPE:CV -OUT:"$@"
ifeq ($(MOZ_BITS),32)
ifdef GLOWCODE
ifdef MOZ_DEBUG
DLLFLAGS = -DEBUG -DEBUGTYPE:both -INCLUDE:_GlowCode -OUT:"$@"
endif
endif
endif
OBJDIR_TAG = _DBG
LDFLAGS = -DEBUG -DEBUGTYPE:CV
endif

7
nsprpub/lib/ds/Makefile
View File

@ -53,6 +53,13 @@ RES=$(OBJDIR)/ds.res
RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
OS_LIBS = user32.lib
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
ifdef MOZ_DEBUG
ifdef GLOWCODE
EXTRA_LIBS += c:/bin/glowcode/glowcode.lib
endif
endif
endif
else
ifeq ($(OS_ARCH), AIX)

7
nsprpub/lib/libc/src/Makefile
View File

@ -59,6 +59,13 @@ DLLBASE=/BASE:0x30000000
RES=$(OBJDIR)/plc.res
RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
EXTRA_LIBS = $(DIST)/lib/libnspr$(MOD_VERSION).lib
ifdef MOZ_DEBUG
ifdef GLOWCODE
EXTRA_LIBS += c:/bin/glowcode/glowcode.lib
endif
endif
endif
else
ifeq ($(OS_ARCH), AIX)

7
nsprpub/lib/msgc/src/Makefile
View File

@ -57,6 +57,13 @@ DLLBASE=/BASE:0x30000000
#RESNAME=$(MOD_DEPTH)/pr/src/nspr.rc
#OS_LIBS = user32.lib
EXTRA_LIBS = $(DIST)/lib/libnspr$(NSPR_VERSION).lib
ifdef MOZ_DEBUG
ifdef GLOWCODE
EXTRA_LIBS += c:/bin/glowcode/glowcode.lib
endif
endif
endif
else
ifeq ($(OS_ARCH), AIX)

7
nsprpub/pr/src/Makefile
View File

@ -239,6 +239,13 @@ OBJS += md/windows/$(OBJDIR)/w95io.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/ntsem.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/win32_errors.$(OBJ_SUFFIX) \
md/windows/$(OBJDIR)/w32poll.$(OBJ_SUFFIX)
ifeq ($(MOZ_BITS),32)
ifdef MOZ_DEBUG
ifdef GLOWCODE
EXTRA_LIBS += c:/bin/glowcode/glowcode.lib
endif
endif
endif
else
ifeq ($(OS_TARGET), OS2)
OBJS += md/os2/$(OBJDIR)/os2io.$(OBJ_SUFFIX) \

3
xpcom/src/makefile.win
View File

@ -29,6 +29,9 @@ LLIBS = \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib \
$(DIST)\lib\libreg32.lib \
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
$(GLOWDIR)\glowcode.lib \
!endif
$(NULL)
LIBNAME = .\$(OBJDIR)\xpcom$(MOZ_BITS)

3
xpcom/tests/dynamic/makefile.win
View File

@ -29,6 +29,9 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
CPPSRCS = \
TestDynamic.cpp \

3
xpcom/tests/makefile.win
View File

@ -38,6 +38,9 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
include <$(DEPTH)\config\rules.mak>

3
xpcom/tests/windows/makefile.win
View File

@ -31,6 +31,9 @@ LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(LIBNSPR) \
$(DIST)\lib\libplc21.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)
LLIBS=$(LLIBS) $(GLOWDIR)\glowcode.lib
!endif
include <$(DEPTH)\config\rules.mak>