Moving changes from XPCOM20_BRANCH forward.

This commit is contained in:
warren%netscape.com 1999-05-24 09:01:47 +00:00
parent 0cd4d27972
commit f6a80b4dec
13 changed files with 7 additions and 21 deletions

View File

@ -22,7 +22,6 @@
#include "nsStandardUrl.h"
#include "nscore.h"
#include "nsString2.h"
#include "nsXPComCIID.h"
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
#include "nsIFileTransportService.h"

View File

@ -35,10 +35,9 @@ PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
LCFLAGS=-DNETSCAPE
LLIBS=$(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\nunet.lib \
$(DIST)\lib\netlib.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\plc3.lib
LINCS=$(LINCS) -I. \

View File

@ -38,7 +38,6 @@
#include "nsRepository.h"
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
#include "nsXPComCIID.h"
#include "nsString.h"
#include "nsIURL.h"

View File

@ -28,8 +28,7 @@ CPP_OBJS= \
LLIBS= \
$(DIST)\lib\netwerkbase_s.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)

View File

@ -33,8 +33,7 @@ CPP_OBJS = \
LLIBS= \
$(DIST)\lib\netwerk.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(DIST)\lib\plc3.lib \
$(LIBNSPR)

View File

@ -36,8 +36,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS= $(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(NULL)
MISCDEP=$(LLIBS)
@ -63,7 +62,6 @@ REQUIRES= netwerk
LINCS= \
-I..\public \
-I$(PUBLIC)\raptor \
-I$(PUBLIC)\netwerk \
-I$(PUBLIC)\xpcom \
$(NULL)

View File

@ -33,8 +33,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS= $(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(NULL)
MISCDEP=$(LLIBS)

View File

@ -36,8 +36,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll
LLIBS= $(LLIBS) \
$(LIBNSPR) \
$(DIST)\lib\plc3.lib \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(NULL)
MISCDEP=$(LLIBS)

View File

@ -33,7 +33,6 @@ CPPSRCS = \
BASE_LIBS = \
-lreg \
-lxpcom \
-lraptorbase \
-lnetwerk \
$(NULL)

View File

@ -23,7 +23,6 @@
#include "nspr.h"
#include "nscore.h"
#include "nsXPComCIID.h"
#include "nsISocketTransportService.h"
#include "nsIEventQueueService.h"
#include "nsIServiceManager.h"

View File

@ -22,7 +22,6 @@
#endif
#include "nscore.h"
#include "nsXPComCIID.h"
#include "nsISocketTransportService.h"
#include "nsIEventQueueService.h"
#include "nsIServiceManager.h"

View File

@ -39,8 +39,7 @@ LINCS = \
$(NULL)
LLIBS= \
$(DIST)\lib\xpcom32.lib \
$(DIST)\lib\raptorbase.lib \
$(DIST)\lib\xpcom.lib \
$(LIBNSPR) \
$(DIST)\lib\plc3.lib
!if "$(MOZ_BITS)"=="32" && defined(MOZ_DEBUG) && defined(GLOWCODE)

View File

@ -34,7 +34,6 @@
#include "nsIComponentManager.h"
#include "nsIServiceManager.h"
#include "nsIEventQueueService.h"
#include "nsXPComCIID.h"
#include "nsString2.h"