diff options
author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-08-25 13:27:44 +0000 |
---|---|---|
committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2008-08-25 13:27:44 +0000 |
commit | 3e38e71089bb9681243399373823dcb93084a796 (patch) | |
tree | 66a26c04116515d3d073e82aa98c3fbeb5f3a545 | |
parent | 8124d3d5ad0e83b1f0b26796cf84e8fa4b563a66 (diff) | |
download | netsurf-3e38e71089bb9681243399373823dcb93084a796.tar.gz netsurf-3e38e71089bb9681243399373823dcb93084a796.tar.bz2 |
Include Amiga-specific options
svn path=/trunk/netsurf/; revision=5198
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | amiga/options.h | 42 | ||||
-rw-r--r-- | desktop/options.c | 2 |
3 files changed, 45 insertions, 1 deletions
@@ -416,7 +416,7 @@ ifeq ($(TARGET),amiga) $(eval $(call feature_enabled,BMP,-DWITH_BMP,-lnsbmp,NetSurf BMP decoder)) $(eval $(call feature_enabled,GIF,-DWITH_GIF,-lnsgif,NetSurf GIF decoder)) - CFLAGS += -mcrt=newlib -D__USE_INLINE__ -std=c99 -I . + CFLAGS += -mcrt=newlib -D__USE_INLINE__ -std=c99 -I . -Dnsamiga LDFLAGS += -lxml2 -lcurl -lm -lsocket -lpthread -lregex -lauto -lraauto -lssl -lcrypto -lamisslauto -mcrt=newlib endif diff --git a/amiga/options.h b/amiga/options.h new file mode 100644 index 000000000..2e6675a34 --- /dev/null +++ b/amiga/options.h @@ -0,0 +1,42 @@ +/* + * Copyright 2008 Chris Young <chris@unsatisfactorysoftware.co.uk> + * + * This file is part of NetSurf, http://www.netsurf-browser.org/ + * + * NetSurf is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * NetSurf is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef AMIGA_OPTIONS_H +#define AMIGA_OPTIONS_H +#include "desktop/options.h" + +extern bool option_verbose_log; +extern char *option_url_file; +extern char *option_hotlist_file; +extern bool option_use_wb; +extern int option_modeid; + +#define EXTRA_OPTION_DEFINE \ +bool option_verbose_log = false; \ +char *option_url_file = 0; \ +char *option_hotlist_file = 0; \ +bool option_use_wb = false; \ +int option_modeid = 0; + +#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_workbench", OPTION_BOOL, &option_use_wb}, \ +{ "screen_modeid", OPTION_INTEGER, &option_modeid}, +#endif diff --git a/desktop/options.c b/desktop/options.c index 197399aa1..ec85da51d 100644 --- a/desktop/options.c +++ b/desktop/options.c @@ -47,6 +47,8 @@ #include "gtk/options.h" #elif defined(nsbeos) #include "beos/options.h" +#elif defined(nsamiga) +#include "amiga/options.h" #else #define EXTRA_OPTION_DEFINE #define EXTRA_OPTION_TABLE |