diff --git a/base/src/makefile.win b/base/src/makefile.win index acdf73497625..2781c33247be 100644 --- a/base/src/makefile.win +++ b/base/src/makefile.win @@ -20,7 +20,7 @@ IGNORE_MANIFEST=1 DIRS = windows -DEFINES=-D_IMPL_NS_BASE +DEFINES=-D_IMPL_NS_BASE -DWIN32_LEAN_AND_MEAN LIBRARY_NAME=raptorbase CPPSRCS=nsArena.cpp nsAtomTable.cpp nsBTree.cpp nsByteBuffer.cpp nsCRT.cpp \ diff --git a/dom/src/makefile.win b/dom/src/makefile.win index 1aac83f1da53..85c6f95af467 100644 --- a/dom/src/makefile.win +++ b/dom/src/makefile.win @@ -22,7 +22,7 @@ MAKE_OBJ_TYPE = DLL DLLNAME = jsdom DLL=.\$(OBJDIR)\$(DLLNAME).dll -DEFINES=-D_IMPL_NS_DOM +DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN CPPSRCS = \ nsJSEnvironment.cpp \ nsJSNode.cpp \ diff --git a/gfx/src/makefile.win b/gfx/src/makefile.win index d0f8ba0032d0..42b7fc8be3fd 100644 --- a/gfx/src/makefile.win +++ b/gfx/src/makefile.win @@ -24,7 +24,7 @@ LIBRARY_NAME=gmgfx MODULE=raptor REQUIRES=util img xpcom raptor -DEFINES=-D_IMPL_NS_GFX +DEFINES=-D_IMPL_NS_GFX -DWIN32_LEAN_AND_MEAN CPPSRCS=nsColor.cpp nsColorNames.cpp nsColorNamesRGB.cpp nsFont.cpp \ nsImageGroup.cpp nsImageManager.cpp nsImageNetContext.cpp \ diff --git a/gfx/src/windows/makefile.win b/gfx/src/windows/makefile.win index 845cf051479a..e4b311abe841 100644 --- a/gfx/src/windows/makefile.win +++ b/gfx/src/windows/makefile.win @@ -25,7 +25,7 @@ DLL=.\$(OBJDIR)\$(DLLNAME).dll MODULE=raptor -DEFINES =-D_IMPL_NS_GFXNONXP +DEFINES =-D_IMPL_NS_GFXNONXP -DWIN32_LEAN_AND_MEAN OBJS = \ .\$(OBJDIR)\nsDeviceContextWin.obj \ diff --git a/htmlparser/src/makefile.win b/htmlparser/src/makefile.win index 9b2ec3abe5f4..6a9f5ccef81d 100644 --- a/htmlparser/src/makefile.win +++ b/htmlparser/src/makefile.win @@ -19,7 +19,7 @@ DEPTH=..\.. IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlpars -DEFINES=-D_IMPL_NS_HTMLPARS +DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN MODULE=raptor REQUIRES=xpcom raptor diff --git a/layout/base/src/makefile.win b/layout/base/src/makefile.win index d430e4a12e35..65e4a002c203 100644 --- a/layout/base/src/makefile.win +++ b/layout/base/src/makefile.win @@ -19,7 +19,7 @@ DEPTH=..\..\.. IGNORE_MANIFEST=1 LIBRARY_NAME=raptorlayout_s -DEFINES=-D_IMPL_NS_LAYOUT +DEFINES=-D_IMPL_NS_LAYOUT -DWIN32_LEAN_AND_MEAN CPPSRCS=nsContainerFrame.cpp nsDocument.cpp nsFrame.cpp \ nsGalleyContext.cpp nsPresContext.cpp nsPresShell.cpp \ nsPrintPreviewContext.cpp nsReflowCommand.cpp nsSpaceManager.cpp \ diff --git a/layout/html/base/src/makefile.win b/layout/html/base/src/makefile.win index f73af901bda2..5ed85e1b690b 100644 --- a/layout/html/base/src/makefile.win +++ b/layout/html/base/src/makefile.win @@ -21,7 +21,7 @@ IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlbase_s MODULE=raptor REQUIRES=xpcom raptor -DEFINES=-D_IMPL_NS_HTML +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN CPPSRCS= \ nsAbsoluteFrame.cpp \ @@ -43,6 +43,7 @@ CPPSRCS= \ nsImageMap.cpp \ nsInlineFrame.cpp \ nsLeafFrame.cpp \ + nsLineLayout.cpp \ nsListItemFrame.cpp \ nsPageFrame.cpp \ nsPlaceholderFrame.cpp \ @@ -75,6 +76,7 @@ CPP_OBJS= \ .\$(OBJDIR)\nsInlineFrame.obj \ .\$(OBJDIR)\nsLeafFrame.obj \ .\$(OBJDIR)\nsListItemFrame.obj \ + .\$(OBJDIR)\nsLineLayout.obj \ .\$(OBJDIR)\nsPageFrame.obj \ .\$(OBJDIR)\nsPlaceholderFrame.obj \ .\$(OBJDIR)\nsRootPart.obj \ diff --git a/layout/html/document/src/makefile.win b/layout/html/document/src/makefile.win index 85dbc6482d29..a83ad5b80d79 100644 --- a/layout/html/document/src/makefile.win +++ b/layout/html/document/src/makefile.win @@ -22,7 +22,7 @@ LIBRARY_NAME=raptorhtmldoc_s MODULE=raptor REQUIRES=xpcom raptor -DEFINES=-D_IMPL_NS_HTML +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN CPPSRCS=nsHTMLContentSink.cpp nsHTMLDocument.cpp diff --git a/layout/html/forms/src/makefile.win b/layout/html/forms/src/makefile.win index 5f9a4bb57abf..853469b3939a 100644 --- a/layout/html/forms/src/makefile.win +++ b/layout/html/forms/src/makefile.win @@ -20,7 +20,7 @@ IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlforms_s -DEFINES=-D_IMPL_NS_HTML +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN MODULE=raptor REQUIRES=xpcom raptor diff --git a/layout/html/style/src/makefile.win b/layout/html/style/src/makefile.win index 5d3a8b0241e8..795368cbf292 100644 --- a/layout/html/style/src/makefile.win +++ b/layout/html/style/src/makefile.win @@ -22,7 +22,7 @@ LIBRARY_NAME=raptorhtmlstyle_s MODULE=raptor REQUIRES=xpcom raptor -DEFINES=-D_IMPL_NS_HTML +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN CPPSRCS=nsCSSKeywords.cpp nsCSSLayout.cpp nsCSSDeclaration.cpp \ nsCSSParser.cpp nsCSSProps.cpp nsCSSRendering.cpp nsCSSScanner.cpp \ diff --git a/layout/html/table/src/makefile.win b/layout/html/table/src/makefile.win index 2d1d2a3c6496..2040d70ea40b 100644 --- a/layout/html/table/src/makefile.win +++ b/layout/html/table/src/makefile.win @@ -22,7 +22,7 @@ LIBRARY_NAME=raptorhtmltable_s MODULE=raptor REQUIRES=xpcom raptor -DEFINES=-D_IMPL_NS_HTML +DEFINES=-D_IMPL_NS_HTML -DWIN32_LEAN_AND_MEAN CPPSRCS=nsCellLayoutData.cpp nsCellMap.cpp nsColLayoutData.cpp \ nsTableCaption.cpp nsTableCaptionFrame.cpp nsTableCell.cpp \ diff --git a/parser/htmlparser/src/makefile.win b/parser/htmlparser/src/makefile.win index 9b2ec3abe5f4..6a9f5ccef81d 100644 --- a/parser/htmlparser/src/makefile.win +++ b/parser/htmlparser/src/makefile.win @@ -19,7 +19,7 @@ DEPTH=..\.. IGNORE_MANIFEST=1 LIBRARY_NAME=raptorhtmlpars -DEFINES=-D_IMPL_NS_HTMLPARS +DEFINES=-D_IMPL_NS_HTMLPARS -DWIN32_LEAN_AND_MEAN MODULE=raptor REQUIRES=xpcom raptor diff --git a/view/src/makefile.win b/view/src/makefile.win index 7a2fb2f388aa..079b68da30b8 100644 --- a/view/src/makefile.win +++ b/view/src/makefile.win @@ -25,7 +25,7 @@ MISCDEP = $(LLIBS) MODULE=raptor -DEFINES =-D_IMPL_NS_VIEW +DEFINES =-D_IMPL_NS_VIEW -DWIN32_LEAN_AND_MEAN OBJS = \ .\$(OBJDIR)\nsView.obj \ diff --git a/webshell/src/makefile.win b/webshell/src/makefile.win index a99573f4787a..9c1e1657a558 100644 --- a/webshell/src/makefile.win +++ b/webshell/src/makefile.win @@ -18,7 +18,7 @@ DEPTH=..\.. IGNORE_MANIFEST=1 -DEFINES=-D_IMPL_NS_WEB +DEFINES=-D_IMPL_NS_WEB -DWIN32_LEAN_AND_MEAN MODULE=raptor CPPSRCS= \