From 132be1eed23315c8fbd72acaa06ccdec62363c73 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sat, 16 Jan 2016 19:37:39 +0000
Subject: [PATCH] OS3 build fixes

---
 amiga/Makefile.target | 2 +-
 amiga/font.c          | 2 +-
 amiga/font_cache.c    | 2 +-
 amiga/gui.c           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/amiga/Makefile.target b/amiga/Makefile.target
index 8c850d1db..9172ce0b0 100644
--- a/amiga/Makefile.target
+++ b/amiga/Makefile.target
@@ -7,7 +7,7 @@ CFLAGS += -std=c99 -Dnsamiga
 ifneq ($(SUBTARGET),os3)
   CFLAGS += -O2 -finline-functions -U__STRICT_ANSI__ -D__USE_INLINE__ -D__USE_BASETYPE__
 else
-  CFLAGS += -m68020-60 -O0 -DPATH_MAX=1024 -D__m68k__
+  CFLAGS += -msoft-float -m68020-60 -O0 -DPATH_MAX=1024 -D__m68k__
 endif
 
 NETSURF_FEATURE_ROSPRITE_CFLAGS := -DWITH_NSSPRITE
diff --git a/amiga/font.c b/amiga/font.c
index ac5fd129f..b7e31cea8 100644
--- a/amiga/font.c
+++ b/amiga/font.c
@@ -41,7 +41,7 @@ void ami_font_setdevicedpi(int id)
 
 	if(nsoption_bool(bitmap_fonts) == true) {
 		LOG("WARNING: Using diskfont.library for text. Forcing DPI to 72.");
-		nsoption_int(screen_ydpi) = 72;
+		nsoption_set_int(screen_ydpi, 72);
 	}
 
 	browser_set_dpi(nsoption_int(screen_ydpi));
diff --git a/amiga/font_cache.c b/amiga/font_cache.c
index b036f6334..e3f107dd8 100644
--- a/amiga/font_cache.c
+++ b/amiga/font_cache.c
@@ -171,7 +171,7 @@ void ami_font_cache_insert(struct ami_font_cache_node *nodedata, const char *fon
 #ifndef __amigaos4__
 	struct nsObject *node = AddObject(ami_font_cache_list, AMINS_FONT);
 	if(node) {
-		ObjectCallback(ami_font_bullet_close);
+		ObjectCallback(node, ami_font_bullet_close);
 		node->objstruct = nodedata;
 		node->dtz_Node.ln_Name = strdup(font);
 	}
diff --git a/amiga/gui.c b/amiga/gui.c
index 837063639..e0f370f6e 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -562,7 +562,7 @@ static nserror ami_set_options(struct nsoption_s *defaults)
 	nsoption_set_bool(font_antialiasing, false);
 	nsoption_set_bool(truecolour_mouse_pointers, false);
 	nsoption_set_bool(use_openurl_lib, true);
-	nsoption_set_bool(use_diskfont, true);
+	nsoption_set_bool(bitmap_fonts, true);
 #endif
 
 	if((!nsoption_charp(accept_language)) ||