Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-31 22:25:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed Raptor build bustage caused by the OJI landing...

Browse Source
This commit is contained in:
michaelp%netscape.com 1998-07-31 23:32:08 +00:00
parent 383e588a3a
commit eeeec3649e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
base/tests/makefile.win
View File

@ -20,13 +20,13 @@ DEPTH=..\..
MAKE_OBJ_TYPE = EXE MAKE_OBJ_TYPE = EXE
PROG0 = .\$(OBJDIR)\TimerTest.exe PROG0 = .\$(OBJDIR)\TimerTest.exe
PROG1 = .\$(OBJDIR)\TestAtoms.exe PROG1 = .\$(OBJDIR)\TestAtoms.exe
#PROG2 = .\$(OBJDIR)\CvtURL.exe PROG2 = .\$(OBJDIR)\CvtURL.exe
PROG3 = .\$(OBJDIR)\TestCRT.exe PROG3 = .\$(OBJDIR)\TestCRT.exe
RESFILE = timer.res RESFILE = timer.res
PROGRAMS = $(PROG0) $(PROG1) \ PROGRAMS = $(PROG0) $(PROG1) \
!ifdef MODULAR_NETLIB !ifdef MODULAR_NETLIB
# $(PROG2) \ $(PROG2) \
$(PROG3) \ $(PROG3) \
!endif !endif
$(NULL) $(NULL)
@ -35,7 +35,9 @@ LINCS=-I..\src -I$(PUBLIC)\xpcom -I$(PUBLIC)\netlib
LLIBS= \ LLIBS= \
$(DIST)\lib\xpcom32.lib \ $(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \ $(DIST)\lib\raptorbase.lib \
$(DIST)\lib\network.lib \ !ifdef MODULAR_NETLIB
$(DIST)\lib\netlib.lib \
!endif
$(LIBNSPR) \ $(LIBNSPR) \
$(DIST)\lib\libplc21.lib \ $(DIST)\lib\libplc21.lib \
$(RESFILE) $(RESFILE)
@ -46,7 +48,7 @@ install:: $(PROGRAMS)
$(MAKE_INSTALL) $(PROG0) $(DIST)\bin $(MAKE_INSTALL) $(PROG0) $(DIST)\bin
$(MAKE_INSTALL) $(PROG1) $(DIST)\bin $(MAKE_INSTALL) $(PROG1) $(DIST)\bin
!ifdef MODULAR_NETLIB !ifdef MODULAR_NETLIB
# $(MAKE_INSTALL) $(PROG2) $(DIST)\bin $(MAKE_INSTALL) $(PROG2) $(DIST)\bin
$(MAKE_INSTALL) $(PROG3) $(DIST)\bin $(MAKE_INSTALL) $(PROG3) $(DIST)\bin
!endif !endif
@ -78,6 +80,8 @@ $(PROG0): $(OBJDIR) TimerTest.cpp $(RESFILE)
$(PROG1): $(OBJDIR) TestAtoms.cpp $(PROG1): $(OBJDIR) TestAtoms.cpp
# $(PROG2): $(OBJDIR) CvtURL.cpp !ifdef MODULAR_NETLIB
$(PROG2): $(OBJDIR) CvtURL.cpp
# $(PROG2): $(OBJDIR) TestCRT.cpp $(PROG3): $(OBJDIR) TestCRT.cpp
!endif