diff options
| -rw-r--r-- | content/urldb.c | 5 | ||||
| -rw-r--r-- | frontends/amiga/Makefile | 3 | ||||
| -rw-r--r-- | frontends/amiga/Makefile.defaults | 11 | ||||
| -rw-r--r-- | frontends/amiga/gui.c | 6 |
4 files changed, 24 insertions, 1 deletions
diff --git a/content/urldb.c b/content/urldb.c index c4a5a6b22..d93cc5898 100644 --- a/content/urldb.c +++ b/content/urldb.c @@ -116,6 +116,11 @@ #include "content/content.h" #include "content/urldb.h" +#ifdef WITH_AMISSL +/* AmiSSL needs everything to be using bsdsocket directly to avoid conflicts */ +#include <proto/bsdsocket.h> +#endif + /** * cookie entry. * diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 858492203..7c4d16e8a 100644 --- a/frontends/amiga/Makefile +++ b/frontends/amiga/Makefile @@ -12,11 +12,12 @@ endif $(eval $(call feature_enabled,AMIGA_ICON,-DWITH_AMIGA_ICON,,Amiga icon)) $(eval $(call feature_enabled,AMIGA_DATATYPES,-DWITH_AMIGA_DATATYPES,,DataTypes)) +$(eval $(call feature_enabled,AMISSL,-DWITH_AMISSL -D__NO_NET_API -D__NO_NETINCLUDE_ERRNO -I/opt/netsurf/m68k-unknown-amigaos/cross/m68k-unknown-amigaos/netinclude,-lamisslauto,AmiSSL)) CFLAGS += -I$(GCCSDK_INSTALL_ENV)/include CFLAGS += $(shell $(PKG_CONFIG) --cflags tre) -LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) +#LDFLAGS += $(shell $(PKG_CONFIG) --static --libs libcurl openssl) LDFLAGS += $(shell $(PKG_CONFIG) --libs tre) LDFLAGS += -L$(GCCSDK_INSTALL_ENV)/lib diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index f19d6e394..17e097d29 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -6,6 +6,11 @@ # Valid options: YES, NO NETSURF_USE_LIBICONV_PLUG := NO +# Use AmiSSL for secure connections. +# Either this or NETSURF_USE_OPENSSL should be specified, not both. +# Valid options: YES, NO +NETSURF_USE_AMISSL := NO + # Enable NetSurf's use of librosprite for displaying RISC OS Sprites # Valid options: YES, NO, AUTO NETSURF_USE_ROSPRITE := NO @@ -30,3 +35,9 @@ NETSURF_FS_BACKING_STORE := YES # Optimisation levels CFLAGS += -fomit-frame-pointer -gstabs +# Target-specific +ifeq ($(SUBTARGET),os3) + NETSURF_USE_OPENSSL := NO + NETSURF_USE_AMISSL := YES +endif + diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c index 43dd35182..cc4397ede 100644 --- a/frontends/amiga/gui.c +++ b/frontends/amiga/gui.c @@ -40,6 +40,12 @@ #include <proto/utility.h> #include <proto/wb.h> +#ifdef WITH_AMISSL +/* AmiSSL needs everything to use bsdsocket.library directly to avoid problems */ +#include <proto/bsdsocket.h> +#define waitselect WaitSelect +#endif + /* Other OS includes */ #include <datatypes/textclass.h> #include <devices/inputevent.h> |