summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2012-03-26 20:25:10 +0000
committerChris Young <chris@unsatisfactorysoftware.co.uk>2012-03-26 20:25:10 +0000
commit307df869c33cb3317d330201d069399a9f91afec (patch)
tree1fbdd0dbef3cb5a633a46fa4d340aeb89f956dbd
parentcb715fe217864aa4800ec9f5a53a2ddd883224a6 (diff)
downloadnetsurf-307df869c33cb3317d330201d069399a9f91afec.tar.gz
netsurf-307df869c33cb3317d330201d069399a9f91afec.tar.bz2
fix build
svn path=/trunk/netsurf/; revision=13729
-rw-r--r--amiga/Makefile.target2
-rwxr-xr-xamiga/clipboard.c3
-rwxr-xr-xamiga/gui.c2
-rw-r--r--amiga/system_colour.c18
4 files changed, 5 insertions, 20 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index aa0cef61f..0899b6066 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -30,7 +30,7 @@ ifeq ($(HOST),amiga)
CFLAGS += -I /SDK/local/common/include/libpng12
LDFLAGS += -lxml2 -lcurl -lrtmp -lpthread -lregex -lauto -lpbl
- LDFLAGS += -lssl -lcrypto -lhubbub -lcss -lparserutils -lwapcaplet
+ LDFLAGS += -lssl -lcrypto -ldom -lhubbub -lcss -lparserutils -lwapcaplet
ifeq ($(NETSURF_AMIGA_USE_CAIRO),YES)
CFLAGS += -DNS_AMIGA_CAIRO -I /SDK/local/common/include/cairo
diff --git a/amiga/clipboard.c b/amiga/clipboard.c
index 193b2bcd2..b98ef574a 100755
--- a/amiga/clipboard.c
+++ b/amiga/clipboard.c
@@ -17,9 +17,10 @@
*/
#include "desktop/gui.h"
-#include "utils/utf8.h"
#include "desktop/selection.h"
#include "desktop/textinput.h"
+#include "render/box.h"
+#include "utils/utf8.h"
#include "amiga/bitmap.h"
#include "amiga/clipboard.h"
diff --git a/amiga/gui.c b/amiga/gui.c
index 4a91b6960..2e2509951 100755
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -33,7 +33,9 @@
#include "desktop/textinput.h"
#include "desktop/tree.h"
#include "image/ico.h"
+#include "render/box.h"
#include "render/form.h"
+#include "render/html.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/utf8.h"
diff --git a/amiga/system_colour.c b/amiga/system_colour.c
index 2c7f7d343..e520bf448 100644
--- a/amiga/system_colour.c
+++ b/amiga/system_colour.c
@@ -250,10 +250,6 @@ static struct gui_system_colour_ctx colour_list[] = {
static struct gui_system_colour_ctx *gui_system_colour_pw = NULL;
-extern colour scrollbar_widget_fg_colour;
-extern colour scrollbar_widget_bg_colour;
-extern colour scrollbar_widget_arrow_colour;
-
css_color ami_css_colour_from_pen(struct Screen *screen, UWORD pen);
UWORD ami_system_colour_scrollbar_fgpen(struct DrawInfo *drinfo)
@@ -266,24 +262,10 @@ UWORD ami_system_colour_scrollbar_fgpen(struct DrawInfo *drinfo)
else return FOREGROUNDPEN;
}
-void ami_system_colour_scrollbar_widget(void)
-{
- if(scrn == NULL) return;
-
- scrollbar_widget_fg_colour = p96EncodeColor(RGBFB_A8B8G8R8,
- ami_css_colour_from_pen(scrn, AMINS_SCROLLERPEN));
- scrollbar_widget_bg_colour = p96EncodeColor(RGBFB_A8B8G8R8,
- ami_css_colour_from_pen(scrn, FILLSHADOWPEN));
- scrollbar_widget_arrow_colour = p96EncodeColor(RGBFB_A8B8G8R8,
- ami_css_colour_from_pen(scrn, SHINEPEN));
-}
-
bool gui_system_colour_init(void)
{
unsigned int ccount;
- ami_system_colour_scrollbar_widget();
-
if (gui_system_colour_pw != NULL)
return false;