From 43e91251ad7844961f75c8af0ce7605c6e33f09b Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Wed, 19 Oct 2016 23:07:43 +0100 Subject: windows frontend netsurf options --- frontends/windows/Makefile | 3 ++- frontends/windows/options.h | 33 +++++++++++++++++++++++++++++++++ utils/nsoption.c | 2 ++ utils/nsoption.h | 4 ++++ 4 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 frontends/windows/options.h diff --git a/frontends/windows/Makefile b/frontends/windows/Makefile index cfb1712ca..baaf225f1 100644 --- a/frontends/windows/Makefile +++ b/frontends/windows/Makefile @@ -15,6 +15,7 @@ LDFLAGS += -lgnurx -lgdi32 -lcomctl32 -lws2_32 -lmsimg32 -lshlwapi -mwindows CFLAGS += -U__STRICT_ANSI__ -mwin32 # only windows versions after XP are supported +# https://msdn.microsoft.com/en-gb/library/windows/desktop/aa383745 CFLAGS += '-DWINVER=0x0501' CFLAGS += '-D_WIN32_WINNT=0x0501' CFLAGS += '-D_WIN32_WINDOWS=0x0501' @@ -23,7 +24,7 @@ CFLAGS += '-D_WIN32_IE=0x0501' #installed resource path CFLAGS += '-DNETSURF_WINDOWS_RESPATH="$(NETSURF_WINDOWS_RESPATH)"' -WSCFLAGS := -std=c99 -DCURL_STATICLIB -DCARES_STATICLIB -g +WSCFLAGS := -std=c99 -Dnswin32 -DCURL_STATICLIB -DCARES_STATICLIB -g CFLAGS += $(WSCFLAGS) LDFLAGS += $(WSCFLAGS) diff --git a/frontends/windows/options.h b/frontends/windows/options.h new file mode 100644 index 000000000..50e6e00c6 --- /dev/null +++ b/frontends/windows/options.h @@ -0,0 +1,33 @@ +/* + * Copyright 2016 Vincent Sanders + * + * 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 . + */ + +#ifndef _NETSURF_WIN32_OPTIONS_H_ +#define _NETSURF_WIN32_OPTIONS_H_ + +/* currently nothing here */ + +#endif + +/* location to download files to */ +NSOPTION_STRING(downloads_directory, NULL) + +/* where to store URL database */ +NSOPTION_STRING(url_file, NULL) + +/* path to save hotlist file */ +NSOPTION_STRING(hotlist_path, NULL) diff --git a/utils/nsoption.c b/utils/nsoption.c index f92debb30..9ac4778f1 100644 --- a/utils/nsoption.c +++ b/utils/nsoption.c @@ -77,6 +77,8 @@ static struct nsoption_s defaults[] = { #include "atari/options.h" #elif defined(nsmonkey) #include "monkey/options.h" +#elif defined(nswin32) +#include "windows/options.h" #endif { NULL, 0, OPTION_INTEGER, { 0 } } }; diff --git a/utils/nsoption.h b/utils/nsoption.h index 75558f475..62c89c464 100644 --- a/utils/nsoption.h +++ b/utils/nsoption.h @@ -71,6 +71,8 @@ #include "atari/options.h" #elif defined(nsmonkey) #include "monkey/options.h" +#elif defined(nswin32) +#include "windows/options.h" #endif #undef NSOPTION_BOOL @@ -142,6 +144,8 @@ enum nsoption_e { #include "atari/options.h" #elif defined(nsmonkey) #include "monkey/options.h" +#elif defined(nswin32) +#include "windows/options.h" #endif NSOPTION_LISTEND /* end of list */ }; -- cgit v1.2.3