mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow for building against AmiSSL instead of OpenSSL

This commit is contained in:
Chris Young 2019-03-03 16:09:09 +00:00 committed by Vincent Sanders
parent 7c9066b49f
commit 0a72449f4b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
frontends/amiga/Makefile
View File

@ -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

12
frontends/amiga/Makefile.defaults
View File

@ -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