From 8bc997f2d3b16681e4bf335c215d2d5e563b8572 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Tue, 5 Jul 2022 16:17:02 +0100
Subject: [PATCH] Always use PKG_CONFIG make var

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile                 |  2 +-
 plugins/Makefile         | 11 ++++++++---
 src/Makefile.cardinal.mk |  6 +++---
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index b619221..aefe6b1 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,7 @@ endif
 # --------------------------------------------------------------
 # Check for optional system-wide dependencies
 
-ifeq ($(shell pkg-config --exists fftw3f && echo true),true)
+ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
 HAVE_FFTW3F = true
 else
 $(warning fftw3f dependency not installed/available)
diff --git a/plugins/Makefile b/plugins/Makefile
index d787fe4..8796b1a 100644
--- a/plugins/Makefile
+++ b/plugins/Makefile
@@ -194,7 +194,6 @@ PLUGIN_FILES = plugins.cpp
 PLUGIN_FILES += Cardinal/src/Blank.cpp
 PLUGIN_FILES += Cardinal/src/ExpanderInputMIDI.cpp
 PLUGIN_FILES += Cardinal/src/ExpanderOutputMIDI.cpp
-PLUGIN_FILES += Cardinal/src/glBars.cpp
 PLUGIN_FILES += Cardinal/src/HostAudio.cpp
 PLUGIN_FILES += Cardinal/src/HostCV.cpp
 PLUGIN_FILES += Cardinal/src/HostMIDI.cpp
@@ -206,6 +205,12 @@ PLUGIN_FILES += Cardinal/src/HostParameters-Map.cpp
 PLUGIN_FILES += Cardinal/src/HostTime.cpp
 PLUGIN_FILES += Cardinal/src/TextEditor.cpp
 
+ifeq ($(USE_GLES2),true)
+ifeq ($(USE_GLES3),true)
+PLUGIN_FILES += Cardinal/src/glBars.cpp
+endif
+endif
+
 ifneq ($(STATIC_BUILD),true)
 PLUGIN_FILES += Cardinal/src/AudioFile.cpp
 PLUGIN_FILES += Cardinal/src/Carla.cpp
@@ -226,7 +231,7 @@ PLUGIN_FILES += Cardinal/src/DearImGui.cpp
 PLUGIN_FILES += Cardinal/src/DearImGuiColorTextEditor.cpp
 endif
 
-ifeq ($(shell pkg-config --exists fftw3f && echo true),true)
+ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
 PLUGIN_FILES += Cardinal/src/AudioToCVPitch.cpp
 BASE_FLAGS += -DHAVE_FFTW3F
 endif
@@ -953,7 +958,7 @@ endif
 
 ifeq ($(SYSDEPS),true)
 BASE_FLAGS += -DCARDINAL_SYSDEPS
-BASE_FLAGS += $(shell pkg-config --cflags jansson libarchive samplerate speexdsp)
+BASE_FLAGS += $(shell $(PKG_CONFIG) --cflags jansson libarchive samplerate speexdsp)
 BASE_FLAGS += -I../deps/sysroot/include
 else
 BASE_FLAGS += -DZSTDLIB_VISIBILITY=
diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 027c09c..90d1e64 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -116,7 +116,7 @@ endif
 EXTRA_DEPENDENCIES = $(RACK_EXTRA_LIBS) $(CARLA_EXTRA_LIBS)
 EXTRA_LIBS = $(RACK_EXTRA_LIBS) $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 
-ifeq ($(shell pkg-config --exists fftw3f && echo true),true)
+ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
 EXTRA_DEPENDENCIES += ../../deps/aubio/libaubio.a
 EXTRA_LIBS += ../../deps/aubio/libaubio.a
 EXTRA_LIBS += $(shell $(PKG_CONFIG) --libs fftw3f)
@@ -147,7 +147,7 @@ BASE_FLAGS += -I../../include/neon-compat
 BASE_FLAGS += -I../Rack/include
 ifeq ($(SYSDEPS),true)
 BASE_FLAGS += -DCARDINAL_SYSDEPS
-BASE_FLAGS += $(shell pkg-config --cflags jansson libarchive samplerate speexdsp)
+BASE_FLAGS += $(shell $(PKG_CONFIG) --cflags jansson libarchive samplerate speexdsp)
 else
 BASE_FLAGS += -DZSTDLIB_VISIBILITY=
 BASE_FLAGS += -I../Rack/dep/include
@@ -234,7 +234,7 @@ EXTRA_LIBS += -lws2_32 -lwinmm
 endif
 
 ifeq ($(SYSDEPS),true)
-EXTRA_LIBS += $(shell pkg-config --libs jansson libarchive samplerate speexdsp)
+EXTRA_LIBS += $(shell $(PKG_CONFIG) --libs jansson libarchive samplerate speexdsp)
 endif
 
 ifeq ($(WITH_LTO),true)