зеркало из https://github.com/mozilla/pjs.git
added netlib to the include path...
This commit is contained in:
rpotts
Родитель
eec2c87f98
Коммит
374ac13e18
|
|
@ -23,7 +23,7 @@ LIBRARY_NAME = raptorgfx
|
|||
|
||||
MODULE=raptor
|
||||
|
||||
REQUIRES=util img xpcom raptor
|
||||
REQUIRES=util img xpcom raptor netlib
|
||||
|
||||
LCFLAGS=-D_IMPL_NS_GFX
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ DIRS = windows
|
|||
|
||||
LIBRARY_NAME=gmgfx
|
||||
MODULE=raptor
|
||||
REQUIRES=util img xpcom raptor
|
||||
REQUIRES=util img xpcom raptor netlib
|
||||
|
||||
DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN
|
||||
|
||||
|
|
@ -45,8 +45,9 @@ CPP_OBJS=.\$(OBJDIR)\nsColor.obj .\$(OBJDIR)\nsColorNames.obj \
|
|||
.\$(OBJDIR)\nsImageURL.obj .\$(OBJDIR)\nsRect.obj \
|
||||
.\$(OBJDIR)\nsTransform2D.obj .\$(OBJDIR)\nsFontCache.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\util -I$(XPDIST)\public\img \
|
||||
-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor
|
||||
LINCS=-I$(PUBLIC)\util -I$(PUBLIC)\img \
|
||||
-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I$(PUBLIC)\netlib
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = raptorgfx
|
||||
|
|
@ -64,6 +65,7 @@ LLIBS= \
|
|||
$(DIST)\lib\img3240.lib \
|
||||
$(DIST)\lib\util.lib \
|
||||
$(DIST)\lib\libplc21.lib \
|
||||
$(DIST)\lib\netlib.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ EXPORTS = \
|
|||
|
||||
MODULE = raptor
|
||||
|
||||
REQUIRES = xpcom raptor
|
||||
REQUIRES = xpcom netlib raptor
|
||||
|
||||
include $(DEPTH)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ IGNORE_MANIFEST=1
|
|||
LIBRARY_NAME=raptorhtmlpars
|
||||
DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN
|
||||
MODULE=raptor
|
||||
REQUIRES=xpcom raptor
|
||||
REQUIRES=xpcom raptor netlib
|
||||
|
||||
CPPSRCS=nsHTMLContentSink.cpp \
|
||||
nsHTMLTokens.cpp nsParserNode.cpp nsScanner.cpp \
|
||||
|
|
@ -41,7 +41,7 @@ CPP_OBJS=.\$(OBJDIR)\nsHTMLContentSink.obj \
|
|||
.\$(OBJDIR)\nsScanner.obj .\$(OBJDIR)\nsToken.obj \
|
||||
.\$(OBJDIR)\nsTokenizer.obj .\$(OBJDIR)\nsTokenHandler.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = raptorhtmlpars
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ EXPORTS = \
|
|||
|
||||
MODULE = raptor
|
||||
|
||||
REQUIRES = xpcom raptor dom
|
||||
REQUIRES = xpcom raptor dom netlib
|
||||
|
||||
include $(DEPTH)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -41,8 +41,8 @@ CPP_OBJS=.\$(OBJDIR)\nsContainerFrame.obj .\$(OBJDIR)\nsDocument.obj \
|
|||
.\$(OBJDIR)\nsSplittableFrame.obj .\$(OBJDIR)\nsStyleCoord.obj \
|
||||
.\$(OBJDIR)\nsStyleContext.obj .\$(OBJDIR)\nsStyleSet.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
-I$(XPDIST)\public\dom -I$(XPDIST)\public\js
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib
|
||||
|
||||
LCFLAGS = \
|
||||
$(LCFLAGS) \
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ EXPORTS = \
|
|||
|
||||
MODULE = raptor
|
||||
|
||||
REQUIRES = xpcom raptor dom
|
||||
REQUIRES = xpcom raptor dom netlib
|
||||
|
||||
include $(DEPTH)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -86,8 +86,8 @@ CPP_OBJS= \
|
|||
|
||||
EXPORTS=nsGlobalVariables.h
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
-I..\..\style\src -I$(PUBLIC)\dom \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I..\..\style\src -I$(PUBLIC)\dom -I$(PUBLIC)\netlib \
|
||||
-I..\..\..\base\src
|
||||
|
||||
LCFLAGS = \
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ INCLUDES += \
|
|||
|
||||
MODULE = raptor
|
||||
|
||||
REQUIRES = xpcom raptor dom
|
||||
REQUIRES = xpcom raptor dom netlib
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ EXPORTS = \
|
|||
nsIHTMLDocument.h \
|
||||
$(NULL)
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I..\..\base\src -I..\..\forms\src \
|
||||
-I..\..\style\src -I..\..\table\src -I$(PUBLIC)\dom \
|
||||
-I..\..\..\base\src
|
||||
-I$(PUBLIC)\netlib -I..\..\..\base\src
|
||||
|
||||
LCFLAGS = \
|
||||
$(LCFLAGS) \
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ MODULE = raptor
|
|||
|
||||
INCLUDES += -I../../../base/src -I../../base/src -I../../style/src
|
||||
|
||||
REQUIRES = xpcom raptor dom
|
||||
REQUIRES = xpcom raptor dom netlib
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -34,10 +34,10 @@ CPP_OBJS=.\$(OBJDIR)\nsForm.obj .\$(OBJDIR)\nsInput.obj \
|
|||
.\$(OBJDIR)\nsInputImage.obj .\$(OBJDIR)\nsInputRadio.obj \
|
||||
.\$(OBJDIR)\nsInputText.obj .\$(OBJDIR)\nsSelect.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I..\..\base\src -I..\..\style\src \
|
||||
-I..\..\..\base\src \
|
||||
-I$(PUBLIC)\dom
|
||||
-I$(PUBLIC)\dom -I$(PUBLIC)\netlib
|
||||
|
||||
LCFLAGS = \
|
||||
$(LCFLAGS) \
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ MODULE = raptor
|
|||
|
||||
INCLUDES += -I../../base/src -I../../../base/src -I.
|
||||
|
||||
REQUIRES = xpcom raptor dom
|
||||
REQUIRES = xpcom raptor dom netlib
|
||||
|
||||
include $(DEPTH)/config/rules.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ CPP_OBJS=.\$(OBJDIR)\nsCSSKeywords.obj .\$(OBJDIR)\nsCSSLayout.obj \
|
|||
.\$(OBJDIR)\nsCSSStyleSheet.obj .\$(OBJDIR)\nsHTMLAttributes.obj \
|
||||
.\$(OBJDIR)\nsHTMLStyleSheet.obj .\$(OBJDIR)\nsHTMLValue.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib \
|
||||
-I..\..\..\base\src \
|
||||
-I..\..\base\src
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ CPPSRCS = \
|
|||
TestHTMLTagLookup.cpp \
|
||||
$(NULL)
|
||||
|
||||
INCLUDES+=-I../src -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor
|
||||
INCLUDES+=-I../src -I$(PUBLIC)/xpcom -I$(PUBLIC)/raptor -I$(PUBLIC)/netlib
|
||||
|
||||
DIRS =
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ LCFLAGS = \
|
|||
$(NULL)
|
||||
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\dom \
|
||||
-I..\base\src -I..\style\src \
|
||||
-I$(PUBLIC)\netlib -I..\base\src -I..\style\src \
|
||||
-I..\..\base\src
|
||||
|
||||
LLIBS= \
|
||||
|
|
@ -47,6 +47,7 @@ LLIBS= \
|
|||
$(DIST)\lib\util.lib \
|
||||
$(DIST)\lib\xpcom32.lib \
|
||||
$(DIST)\lib\jsdom.lib \
|
||||
$(DIST)\lib\netlib.lib \
|
||||
$(LIBNSPR) \
|
||||
$(DIST)\lib\libplc21.lib
|
||||
|
||||
|
|
|
|||
|
|
@ -48,7 +48,7 @@ EXPORTS = \
|
|||
|
||||
MODULE = raptor
|
||||
|
||||
REQUIRES = xpcom raptor
|
||||
REQUIRES = xpcom netlib raptor
|
||||
|
||||
include $(DEPTH)/config/config.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ IGNORE_MANIFEST=1
|
|||
LIBRARY_NAME=raptorhtmlpars
|
||||
DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN
|
||||
MODULE=raptor
|
||||
REQUIRES=xpcom raptor
|
||||
REQUIRES=xpcom raptor netlib
|
||||
|
||||
CPPSRCS=nsHTMLContentSink.cpp \
|
||||
nsHTMLTokens.cpp nsParserNode.cpp nsScanner.cpp \
|
||||
|
|
@ -41,7 +41,7 @@ CPP_OBJS=.\$(OBJDIR)\nsHTMLContentSink.obj \
|
|||
.\$(OBJDIR)\nsScanner.obj .\$(OBJDIR)\nsToken.obj \
|
||||
.\$(OBJDIR)\nsTokenizer.obj .\$(OBJDIR)\nsTokenHandler.obj
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor -I$(PUBLIC)\netlib
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = raptorhtmlpars
|
||||
|
|
|
|||
|
|
@ -41,7 +41,8 @@ CPP_OBJS= \
|
|||
.\$(OBJDIR)\nsWebWidget.obj \
|
||||
$(NULL)
|
||||
|
||||
LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor -I$(XPDIST)\public\dom -I$(XPDIST)\public\js
|
||||
LINCS=-I$(PUBLIC)\xpcom -I$(PUBLIC)\raptor \
|
||||
-I$(PUBLIC)\dom -I$(PUBLIC)\js -I$(PUBLIC)\netlib
|
||||
|
||||
MAKE_OBJ_TYPE = DLL
|
||||
DLLNAME = raptorweb
|
||||
|
|
@ -62,6 +63,7 @@ LLIBS= \
|
|||
$(DIST)\lib\util.lib \
|
||||
$(DIST)\lib\libplc21.lib \
|
||||
$(DIST)\lib\jsdom.lib \
|
||||
$(DIST)\lib\netlib.lib \
|
||||
$(LIBNSPR)
|
||||
|
||||
include <$(DEPTH)\config\rules.mak>
|
||||
|
|
|
|||
|
|
@ -1,96 +0,0 @@
|
|||
# The contents of this file are subject to the Netscape Public License
|
||||
# Version 1.0 (the "NPL"); you may not use this file except in
|
||||
# compliance with the NPL. You may obtain a copy of the NPL at
|
||||
# http://www.mozilla.org/NPL/
|
||||
#
|
||||
# Software distributed under the NPL is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
|
||||
# for the specific language governing rights and limitations under the
|
||||
# NPL.
|
||||
#
|
||||
# The Initial Developer of this code under the NPL is Netscape
|
||||
# Communications Corporation. Portions created by Netscape are
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All Rights
|
||||
# Reserved.
|
||||
|
||||
NODEPEND=1
|
||||
IGNORE_MANIFEST = 1
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
# New build system where zip dll is build indepenant of java stubs.
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
MODULE = nettest
|
||||
EXPORTS = \
|
||||
$(NULL)
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Specify the depth of the current directory relative to the
|
||||
#// root of NS
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
DEPTH= ..\..\..
|
||||
|
||||
MAKE_OBJ_TYPE=EXE
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Make Variables here: (ie. PDFFILE, MAPFILE, ...)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
EXENAME=nettest
|
||||
PDBFILE=nettest.pdb
|
||||
MAPFILE=nettest.map
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define the files necessary to build the target (ie. OBJS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
OBJS= \
|
||||
.\$(OBJDIR)\nettest.obj \
|
||||
$(NULL)
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any Public Targets here (ie. PROGRAM, LIBRARY, DLL, ...)
|
||||
#// (these must be defined before the common makefiles are included)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
|
||||
PROGRAM=.\$(OBJDIR)\$(EXENAME).EXE
|
||||
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Define any local options for the make tools
|
||||
#// (ie. LCFLAGS, LLFLAGS, LLIBS, LINCS)
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
LCFLAGS=-DNETSCAPE
|
||||
LLIBS=$(LLIBS) \
|
||||
$(DIST)\lib\xpcom32.lib \
|
||||
$(DIST)\lib\netlib.lib \
|
||||
$(DIST)\lib\libplc21.lib
|
||||
|
||||
LINCS=$(LINCS) -I. \
|
||||
-I$(PUBLIC)\raptor \
|
||||
-I$(PUBLIC)\netlib \
|
||||
-I$(PUBLIC)\xpcom
|
||||
|
||||
# clobber and clobber_all will remove the following garbage:
|
||||
GARBAGE = $(GARBAGE) _gen
|
||||
|
||||
#//------------------------------------------------------------------------
|
||||
#//
|
||||
#// Include the common makefile rules
|
||||
#//
|
||||
#//------------------------------------------------------------------------
|
||||
include <$(DEPTH)/config/rules.mak>
|
||||
|
||||
install:: $(PROGRAM)
|
||||
$(MAKE_INSTALL) $(PROGRAM) $(DIST)\bin
|
||||
|
||||
clobber::
|
||||
rm -f $(DIST)\bin\$(EXENAME).exe
|
||||
Загрузка…
Ссылка в новой задаче