From ae364de4cf1c936e2d8316f96aa5654b330f14cc Mon Sep 17 00:00:00 2001 From: heck Date: Wed, 26 Aug 2020 21:29:06 +0200 Subject: [PATCH] Adjust build etc. for MacOS --- Makefile | 4 +++- Makefile.conf | 2 +- setup.py | 8 +------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile b/Makefile index 78e08b9..466b150 100644 --- a/Makefile +++ b/Makefile @@ -12,7 +12,9 @@ clean: devenv: LD_LIBRARY_PATH=$(PREFIX)/lib \ - PYTHONPATH=`pwd`/build/lib.linux-x86_64-3.7:\ + DYLD_LIBRARY_PATH=$(PREFIX)/lib \ + PYTHONPATH=$PYTHONPATH:`pwd`/build/lib.linux-x86_64-3.7:\ + PYTHONPATH=$PYTHONPATH:`pwd`/build/lib.macosx-10.9-x86_64-3.8:\ `pwd`/src \ bash -l diff --git a/Makefile.conf b/Makefile.conf index 9bacf8a..3ca9e1d 100644 --- a/Makefile.conf +++ b/Makefile.conf @@ -1,7 +1,7 @@ HERE:=$(dir $(lastword $(MAKEFILE_LIST))) # Defaults -DEBUG=1 +DEBUG=0 PREFIX?=$(HOME) BUILD_DIR = ./build diff --git a/setup.py b/setup.py index 445936c..d71d00e 100644 --- a/setup.py +++ b/setup.py @@ -96,20 +96,14 @@ class BuildExtCommand(build_ext): home = environ.get('PER_USER_DIRECTORY') or environ.get('HOME') sys_includes = [ '/opt/local/include', - '/usr/local/include', - '/Library/Frameworks/PrettyEasyPrivacy.framework/Versions/A/include', - '/usr/include', ] sys_libdirs = [ '/opt/local/lib', - '/usr/local/lib', - '/Library/Frameworks/PrettyEasyPrivacy.framework/Versions/A/lib', - '/usr/lib', ] libs = [ 'pEpEngine', 'pEpAdapter', - 'boost_python37-mt', + 'boost_python38-mt', 'boost_locale-mt' ] return (home, sys_includes, sys_libdirs, libs)