diff options
author | Sven Weidauer <sven@5sw.de> | 2017-12-23 12:44:24 +0100 |
---|---|---|
committer | Sven Weidauer <sven@5sw.de> | 2017-12-23 12:44:24 +0100 |
commit | fe93704cb3d33b9e48515a9f208d4128c1cc7407 (patch) | |
tree | 0a6736368df7c0a39230d31fa1a12a9ca00d484f /frontends/cocoa | |
parent | 41ebd942f91ba86f20396afd884a208ef93c93c9 (diff) | |
download | netsurf-fe93704cb3d33b9e48515a9f208d4128c1cc7407.tar.gz netsurf-fe93704cb3d33b9e48515a9f208d4128c1cc7407.tar.bz2 |
Don’t hardcode OpenSSL paths and detect RSVG using pkg-config
Diffstat (limited to 'frontends/cocoa')
-rw-r--r-- | frontends/cocoa/Makefile | 17 |
1 files 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) |