From da6fe41d75832bf20e1b0b8b7e0e7be63878103e Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Tue, 4 Oct 2016 10:25:49 +0200 Subject: [PATCH 1/2] Makefile: fix video libs check --- cfg/checks/video.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/checks/video.mk b/cfg/checks/video.mk index 1495c4b..2962538 100644 --- a/cfg/checks/video.mk +++ b/cfg/checks/video.mk @@ -8,14 +8,14 @@ else endif # Check if we can build video support -CHECK_VIDEO_LIBS = $(shell pkg-config --exists $(VIDEO_LIBS) || echo -n "error") +CHECK_VIDEO_LIBS = $(shell $(PKG-CONFIG) --exists $(VIDEO_LIBS) || echo -n "error") ifneq ($(CHECK_VIDEO_LIBS), error) LIBS += $(VIDEO_LIBS) CFLAGS += $(VIDEO_CFLAGS) OBJ += $(VIDEO_OBJ) else ifneq ($(MAKECMDGOALS), clean) - MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! pkg-config --exists $$lib ; then echo $$lib ; fi ; done) + MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! $(PKG-CONFIG) --exists $$lib ; then echo $$lib ; fi ; done) $(warning WARNING -- Toxic will be compiled without video support) $(warning WARNING -- You will need these libraries for video support) $(warning WARNING -- $(MISSING_VIDEO_LIBS)) -endif \ No newline at end of file +endif From 34c29745ccd3eeea0547d73955338a1445c50248 Mon Sep 17 00:00:00 2001 From: Ansa89 Date: Wed, 5 Oct 2016 09:09:22 +0200 Subject: [PATCH 2/2] Makefile: use correct variable name when checking video libs --- cfg/checks/video.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfg/checks/video.mk b/cfg/checks/video.mk index 2962538..cfef619 100644 --- a/cfg/checks/video.mk +++ b/cfg/checks/video.mk @@ -8,13 +8,13 @@ else endif # Check if we can build video support -CHECK_VIDEO_LIBS = $(shell $(PKG-CONFIG) --exists $(VIDEO_LIBS) || echo -n "error") +CHECK_VIDEO_LIBS = $(shell $(PKG_CONFIG) --exists $(VIDEO_LIBS) || echo -n "error") ifneq ($(CHECK_VIDEO_LIBS), error) LIBS += $(VIDEO_LIBS) CFLAGS += $(VIDEO_CFLAGS) OBJ += $(VIDEO_OBJ) else ifneq ($(MAKECMDGOALS), clean) - MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! $(PKG-CONFIG) --exists $$lib ; then echo $$lib ; fi ; done) + MISSING_VIDEO_LIBS = $(shell for lib in $(VIDEO_LIBS) ; do if ! $(PKG_CONFIG) --exists $$lib ; then echo $$lib ; fi ; done) $(warning WARNING -- Toxic will be compiled without video support) $(warning WARNING -- You will need these libraries for video support) $(warning WARNING -- $(MISSING_VIDEO_LIBS))