From b63251e00b1123798a9cfa41f381e0f39b72a11b Mon Sep 17 00:00:00 2001 From: horchi Date: Mon, 2 Dec 2019 09:33:48 +0100 Subject: 2019-12-02: version 1.1.103 (horchi)\n - bugfix: fixed python patch\n\n --- HISTORY.h | 7 +++++-- Make.config | 2 +- Makefile | 6 +++++- lib/Makefile | 1 + 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/HISTORY.h b/HISTORY.h index 9eac9ec..e95f6da 100644 --- a/HISTORY.h +++ b/HISTORY.h @@ -5,8 +5,8 @@ * */ -#define _VERSION "1.1.102" -#define VERSION_DATE "28.11.2019" +#define _VERSION "1.1.103" +#define VERSION_DATE "02.13.2019" #define DB_API 7 @@ -19,6 +19,9 @@ /* * ------------------------------------ +2019-12-02: version 1.1.103 (horchi) + - bugfix: fixed python patch + 2019-11-28: version 1.1.102 (horchi) - added: Support of python 3.8 (by Alexander Grothe) diff --git a/Make.config b/Make.config index d1a9c52..b60af0f 100644 --- a/Make.config +++ b/Make.config @@ -46,7 +46,7 @@ ifdef USEPYTHON endif LIBS += $(PYTHON_LIBS) BASELIBS += $(PYTHON_LIBS) - CFLAGS += $(shell python-config --includes) + CXXFLAGS += $(shell $(PYTHON)-config --includes) endif USES = -DVDR_PLUGIN -DUSEUUID -DUSEMD5 -DUSEJSON -DUSEGUNZIP -DPLUGIN_NAME_I18N='"$(PLUGIN)"' diff --git a/Makefile b/Makefile index 59fc56d..931aabe 100644 --- a/Makefile +++ b/Makefile @@ -66,11 +66,15 @@ OBJS = $(PLUGIN).o \ status.o ttools.o svdrpclient.o \ menu.o menusched.o menutimers.o menudone.o menusearchtimer.o -LIBS = $(HLIB) +LIBS += $(HLIB) LIBS += -lrt -larchive -lcrypto LIBS += $(shell pkg-config --libs uuid) LIBS += $(shell pkg-config --libs tinyxml2) LIBS += $(shell mysql_config --libs_r) +ifdef USEPYTHON + CFLAGS += $(shell $(PYTHON)-config --includes) + LIBS += $(PYTHON_LIBS) +endif LIBS += $(shell pkg-config --libs jansson) EPG2VDR_DATA_DIR = "/var/cache/vdr" diff --git a/lib/Makefile b/lib/Makefile index 9d23cdc..6c00449 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -29,6 +29,7 @@ BASELIBS += -lrt BASELIBS += $(shell mysql_config --libs_r) BASELIBS += $(shell pkg-config --libs uuid) BASELIBS += $(shell pkg-config --libs zlib) +BASELIBS += $(PYTHON_LIBS) BASELIBS += $(shell pkg-config --libs tinyxml2) ifdef USECURL -- cgit v1.2.3