diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-03 16:09:09 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-03 16:09:09 +0000 |
| commit | 98e02038f3df6e6178ae14efca4b4ad30ba74316 (patch) | |
| tree | 5857c71493bc3ef1474f0692e61af045b42fdb28 | |
| parent | 13a7004e6b152494eeab677774cdb626b9e1541d (diff) | |
| download | netsurf-98e02038f3df6e6178ae14efca4b4ad30ba74316.tar.gz netsurf-98e02038f3df6e6178ae14efca4b4ad30ba74316.tar.bz2 | |
Allow for building against AmiSSL instead of OpenSSL
| -rw-r--r-- | frontends/amiga/Makefile | 3 | ||||
| -rw-r--r-- | frontends/amiga/Makefile.defaults | 11 |
2 files changed, 13 insertions, 1 deletions
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index ac05d1bf0..8b1345a9c 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,-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 + |