diff options
Diffstat (limited to 'amiga')
-rw-r--r-- | amiga/Makefile.target | 2 | ||||
-rw-r--r-- | amiga/font_scan.c | 33 | ||||
-rwxr-xr-x | amiga/gui.c | 10 |
3 files changed, 12 insertions, 33 deletions
diff --git a/amiga/Makefile.target b/amiga/Makefile.target index f0eabf86e..61de77b36 100644 --- a/amiga/Makefile.target +++ b/amiga/Makefile.target @@ -64,7 +64,7 @@ else ifeq ($(SUBTARGET),os3) LDFLAGS += -liconv else - LDFLAGS += -lauto -lpbl + LDFLAGS += -lauto -lpbl -liconv endif ifeq ($(NETSURF_AMIGA_CAIRO_AVAILABLE),yes) diff --git a/amiga/font_scan.c b/amiga/font_scan.c index 549ea5064..a58acf01b 100644 --- a/amiga/font_scan.c +++ b/amiga/font_scan.c @@ -259,10 +259,10 @@ ULONG ami_font_scan_fonts(struct MinList *list, do { nnode = (struct nsObject *)GetSucc((struct Node *)node); ami_font_scan_gui_update(win, node->dtz_Node.ln_Name, font_num, total); - LOG(("Scanning %s\n", node->dtz_Node.ln_Name)); + LOG(("Scanning %s", node->dtz_Node.ln_Name)); found = ami_font_scan_font(node->dtz_Node.ln_Name, glypharray); total += found; - LOG(("Found %ld new glyphs (total = %ld)\n", found, total)); + LOG(("Found %ld new glyphs (total = %ld)", found, total)); font_num++; } while(node = nnode); @@ -308,7 +308,7 @@ ULONG ami_font_scan_list(struct MinList *list) if(node) { node->dtz_Node.ln_Name = strdup(af[i].af_Attr.ta_Name); found++; - LOG(("Added %s\n", af[i].af_Attr.ta_Name)); + LOG(("Added %s", af[i].af_Attr.ta_Name)); } } } @@ -493,31 +493,4 @@ void ami_font_scan_init(const char *filename, bool force_scan, bool save, LOG(("Initialised with %ld glyphs", found)); } -#ifdef AMI_FONT_SCAN_STANDALONE -/* This can be compiled as standalone using: -* gcc -o font_scan font_scan.c object.c -lwapcaplet -lauto -I .. -D__USE_INLINE__ -DAMI_FONT_SCAN_STANDALONE -*/ -int main(int argc, char** argv) -{ - lwc_string *glypharray[0xffff + 1]; - ULONG found = 0; - BPTR fh; - struct MinList *list; - - if(argc < 2) return 5; - - printf("%s\n",argv[1]); - - list = NewObjList(); - ami_font_scan_init(argv[1], list, glypharray); - FreeObjList(list); - - ami_font_scan_fini(glypharray); - - return 0; -} - -void ami_font_close(APTR discard) { } -void ami_mime_entry_free(APTR discard) { } -#endif diff --git a/amiga/gui.c b/amiga/gui.c index 01f149c31..15ac1f553 100755 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -158,6 +158,7 @@ static char *current_user_dir; const char tree_directory_icon_name[] = "def_drawer.info"; const char tree_content_icon_name[] = "def_project.info"; +static const __attribute__((used)) char *stack_cookie = "\0$STACK:131072\0"; static struct DrawInfo *dri; @@ -540,6 +541,13 @@ nsurl *gui_get_resource_url(const char *path) return url; } +/* Documented in desktop/options.h */ +void gui_options_init_defaults(void) +{ + /* Set defaults for absent option strings */ + ami_set_options(); /* check options and set defaults where required */ +} + void gui_init(int argc, char** argv) { BPTR lock = 0; @@ -549,8 +557,6 @@ void gui_init(int argc, char** argv) ami_clipboard_init(); ami_openurl_open(); - ami_set_options(); /* check options and set defaults where required */ - win_destroyed = false; nsscreentitle = ASPrintf("NetSurf %s",netsurf_version); |