From b9a2def970522a4472168ecd12c338b7ef1aa2b9 Mon Sep 17 00:00:00 2001 From: François Revel Date: Sun, 25 Mar 2012 23:03:11 +0000 Subject: Fix BeOS build: - comment out unneeded includes for now, - fix static lib linking order. svn path=/trunk/netsurf/; revision=13713 --- beos/Makefile.target | 2 +- beos/gui.cpp | 4 ++-- beos/scaffolding.cpp | 4 ++-- beos/window.cpp | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) (limited to 'beos') diff --git a/beos/Makefile.target b/beos/Makefile.target index 964907ed3..ec8719e3e 100644 --- a/beos/Makefile.target +++ b/beos/Makefile.target @@ -10,7 +10,7 @@ LDFLAGS += -L/boot/common/lib # some people do *not* have libm... LDFLAGS += -lxml2 -lcurl -liconv - LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet + LDFLAGS += -lssl -lcrypto -lcss -ldom -lparserutils -lhubbub -lwapcaplet CFLAGS += -I. -O $(WARNFLAGS) -Dnsbeos \ -D_BSD_SOURCE -D_POSIX_C_SOURCE \ diff --git a/beos/gui.cpp b/beos/gui.cpp index 0c3075006..6795efdb5 100644 --- a/beos/gui.cpp +++ b/beos/gui.cpp @@ -55,9 +55,9 @@ extern "C" { #include "desktop/netsurf.h" #include "desktop/options.h" -#include "render/box.h" +//#include "render/box.h" #include "render/form.h" -#include "render/html.h" +//#include "render/html.h" #include "utils/filename.h" #include "utils/log.h" #include "utils/messages.h" diff --git a/beos/scaffolding.cpp b/beos/scaffolding.cpp index afe36bd8f..8dde6e509 100644 --- a/beos/scaffolding.cpp +++ b/beos/scaffolding.cpp @@ -49,10 +49,10 @@ extern "C" { #include "desktop/options.h" #include "desktop/selection.h" #include "desktop/textinput.h" -#include "render/box.h" +//#include "render/box.h" #include "render/font.h" #include "render/form.h" -#include "render/html.h" +//#include "render/html.h" #include "utils/messages.h" #include "utils/schedule.h" #include "utils/utils.h" diff --git a/beos/window.cpp b/beos/window.cpp index b0ead3e5c..89c3d5c83 100644 --- a/beos/window.cpp +++ b/beos/window.cpp @@ -29,6 +29,7 @@ extern "C" { #include "desktop/selection.h" #include "desktop/textinput.h" #include "render/font.h" +#include "render/box.h" #include "utils/log.h" #include "utils/types.h" #include "utils/utf8.h" -- cgit v1.2.3