diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2019-03-03 16:09:09 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2019-04-08 12:49:06 +0100 |
| commit | 0a72449f4bf189cd2fb9e69d72fe582420957a21 (patch) | |
| tree | 2a52911f03383822cd2ce0c8a89e3a9946501bb1 /frontends/amiga | |
| parent | 7c9066b49faed1a4f614a4f2a3f4f6462b377d25 (diff) | |
| download | netsurf-0a72449f4bf189cd2fb9e69d72fe582420957a21.tar.gz netsurf-0a72449f4bf189cd2fb9e69d72fe582420957a21.tar.bz2 | |
Allow for building against AmiSSL instead of OpenSSL
Diffstat (limited to 'frontends/amiga')
| -rw-r--r-- | frontends/amiga/Makefile | 5 | ||||
| -rw-r--r-- | frontends/amiga/Makefile.defaults | 12 |
2 files changed, 16 insertions, 1 deletions
diff --git a/frontends/amiga/Makefile b/frontends/amiga/Makefile index 858492203..b71ae3cf9 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$(GCCSDK_INSTALL_ENV)/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 @@ -24,6 +25,8 @@ LDFLAGS += -lpbl -liconv ifeq ($(SUBTARGET),os3) LDFLAGS += -lamiga -lm +else + LDFLAGS += -lpthread endif EXETARGET := NetSurf diff --git a/frontends/amiga/Makefile.defaults b/frontends/amiga/Makefile.defaults index f19d6e394..2d5cec70c 100644 --- a/frontends/amiga/Makefile.defaults +++ b/frontends/amiga/Makefile.defaults @@ -6,6 +6,12 @@ # 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. +# libcurl must have been built against the same library. +# 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 +36,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 + |