From fe93704cb3d33b9e48515a9f208d4128c1cc7407 Mon Sep 17 00:00:00 2001 From: Sven Weidauer Date: Sat, 23 Dec 2017 12:44:24 +0100 Subject: Don’t hardcode OpenSSL paths and detect RSVG using pkg-config MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontends/cocoa/Makefile | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/frontends/cocoa/Makefile b/frontends/cocoa/Makefile index 212ed0442..7fdefdf1a 100644 --- a/frontends/cocoa/Makefile +++ b/frontends/cocoa/Makefile @@ -4,20 +4,9 @@ POSTEXES += NetSurf.app -# shut up zconf.h and zlib.h -#CFLAGS += -D_LARGEFILE64_SOURCE=1 - -# add Mac Ports include and library paths for openssl -ifneq ($(shell test -d /opt/local && echo 'yes'),) - LDFLAGS += -L/opt/local/lib - CFLAGS += -I/opt/local/include -else - # Check for homebrew installation of openssl - ifneq ($(shell test -d /usr/local/opt/openssl/lib && echo 'yes'),) - LDFLAGS += -L/usr/local/opt/openssl/lib - CFLAGS += -I/usr/local/opt/openssl/include - endif -endif +NETSURF_FEATURE_RSVG_CFLAGS := -DWITH_RSVG +$(eval $(call pkg_config_find_and_add_enabled,RSVG,librsvg-2.0,SVG)) + SDK_PARAM := $(shell xcodebuild -showsdks | awk '/^$$/{p=0};p; /(OS X|macOS) SDKs:/{p=1}' | head -1 | cut -f3) -- cgit v1.2.3