mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-31 19:10:36 +00:00
Moving changes from XPCOM20_BRANCH forward.
This commit is contained in:
parent
0cd4d27972
commit
f6a80b4dec
@ -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"
|
||||
|
@ -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. \
|
||||
|
@ -38,7 +38,6 @@
|
||||
#include "nsRepository.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsXPComCIID.h"
|
||||
#include "nsString.h"
|
||||
|
||||
#include "nsIURL.h"
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
||||
|
@ -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)
|
||||
|
||||
|
@ -33,7 +33,6 @@ CPPSRCS = \
|
||||
BASE_LIBS = \
|
||||
-lreg \
|
||||
-lxpcom \
|
||||
-lraptorbase \
|
||||
-lnetwerk \
|
||||
$(NULL)
|
||||
|
||||
|
@ -23,7 +23,6 @@
|
||||
|
||||
#include "nspr.h"
|
||||
#include "nscore.h"
|
||||
#include "nsXPComCIID.h"
|
||||
#include "nsISocketTransportService.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
|
@ -22,7 +22,6 @@
|
||||
#endif
|
||||
|
||||
#include "nscore.h"
|
||||
#include "nsXPComCIID.h"
|
||||
#include "nsISocketTransportService.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
|
@ -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)
|
||||
|
@ -34,7 +34,6 @@
|
||||
#include "nsIComponentManager.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsIEventQueueService.h"
|
||||
#include "nsXPComCIID.h"
|
||||
#include "nsString2.h"
|
||||
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user