Remove verbose_log from options file

Copy libz as I've built 1.2.4 and it has faster gzip code

svn path=/trunk/netsurf/; revision=10230
This commit is contained in:
Chris Young 2010-04-03 10:24:43 +00:00
parent 5bae5edd7b
commit 6835a312b7
3 changed files with 2 additions and 7 deletions

View File

@ -403,12 +403,11 @@ void gui_init(int argc, char** argv)
ami_open_resources(); /* alloc ports/asl reqs, open libraries/devices */
ami_print_init();
ami_clipboard_init();
ami_openurl_open();
ami_set_options(); /* check options and set defaults where required */
win_destroyed = false;
verbose_log = option_verbose_log;
nsscreentitle = ASPrintf("NetSurf %s",netsurf_version);
default_stylesheet_url = "file:///PROGDIR:Resources/amiga.css";
@ -544,7 +543,6 @@ static void gui_init2(int argc, char** argv)
notalreadyrunning = ami_arexx_init();
ami_fetch_file_register();
ami_openurl_open();
search_web_provider_details(option_search_provider);

View File

@ -20,7 +20,6 @@
#define AMIGA_OPTIONS_H
#include "desktop/options.h"
extern bool option_verbose_log;
extern char *option_url_file;
extern char *option_hotlist_file;
extern char *option_use_pubscreen;
@ -51,7 +50,6 @@ extern bool option_close_no_quit;
extern bool option_hide_docky_icon;
#define EXTRA_OPTION_DEFINE \
bool option_verbose_log = false; \
char *option_url_file = 0; \
char *option_hotlist_file = 0; \
char *option_use_pubscreen = 0; \
@ -82,7 +80,6 @@ bool option_close_no_quit = false; \
bool option_hide_docky_icon = false; \
#define EXTRA_OPTION_TABLE \
{ "verbose_log", OPTION_BOOL, &option_verbose_log}, \
{ "url_file", OPTION_STRING, &option_url_file }, \
{ "hotlist_file", OPTION_STRING, &option_hotlist_file }, \
{ "use_pubscreen", OPTION_STRING, &option_use_pubscreen}, \

View File

@ -21,6 +21,6 @@ copy amiga/pkg/fitr ram:NetSurf/
makedir ram:NetSurf/Rexx
copy amiga/dist/Rexx/~(.svn) ram:NetSurf/Rexx/ COM
makedir ram:NetSurf/SObjs
copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 ram:NetSurf/SObjs clone
copy sobjs:libjpeg.so sobjs:libhubbub.so.0 sobjs:libhpdf-2.2.0.so.0.0 sobjs:libmng.so.1 sobjs:liblcms.so sobjs:libxml2.so sobjs:libparserutils.so.0 sobjs:libnsgif.so.0 sobjs:libnsbmp.so.0 sobjs:libcss.so.0 sobjs:libwapcaplet.so.0 sobjs:libcurl.so sobjs:libsvgtiny.so.0 sobjs:libz.so ram:NetSurf/SObjs clone
;sobjs:libssl-0.9.8.so sobjs:libexpat.so
;sobjs:libgcc.so sobjs:libc.so sobjs:libpthread.so