summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrançois Revel <mmu_man@netsurf-browser.org>2012-03-25 23:03:11 +0000
committerFrançois Revel <mmu_man@netsurf-browser.org>2012-03-25 23:03:11 +0000
commitb9a2def970522a4472168ecd12c338b7ef1aa2b9 (patch)
tree025ff1ffa26257c8e857a439663774251deaed9e
parentad0c132f2bcd8554a445c7c5687e79c35f872c5b (diff)
downloadnetsurf-b9a2def970522a4472168ecd12c338b7ef1aa2b9.tar.gz
netsurf-b9a2def970522a4472168ecd12c338b7ef1aa2b9.tar.bz2
Fix BeOS build:
- comment out unneeded includes for now, - fix static lib linking order. svn path=/trunk/netsurf/; revision=13713
-rw-r--r--beos/Makefile.target2
-rw-r--r--beos/gui.cpp4
-rw-r--r--beos/scaffolding.cpp4
-rw-r--r--beos/window.cpp1
4 files changed, 6 insertions, 5 deletions
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"