From f12d6ae4c94c07822f3209993fa605f25fe8ccef Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 21 Aug 2021 09:40:37 +0100
Subject: [PATCH] Fix some compatibilities

Signed-off-by: falkTX <falktx@falktx.com>
---
 Makefile                       | 13 ++++++++++++-
 dpf                            |  2 +-
 plugins/ProM/DistrhoUIProM.cpp |  8 ++++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 479537d..f0d5e03 100644
--- a/Makefile
+++ b/Makefile
@@ -8,14 +8,25 @@ include dpf/Makefile.base.mk
 
 all: dgl plugins gen
 
+# --------------------------------------------------------------
+# Check for system-wide projectM
+
+HAVE_PROJECTM = $(shell pkg-config --exists libprojectM && echo true)
+
 # --------------------------------------------------------------
 
 dgl:
-	$(MAKE) -C dpf/dgl USE_OPENGL3=true
+	$(MAKE) -C dpf/dgl opengl USE_OPENGL3=true
 
 plugins: dgl
 	$(MAKE) all -C plugins/ProM
 
+ifneq ($(HAVE_PROJECTM),true)
+resources: plugins
+else
+resources:
+endif
+
 ifneq ($(CROSS_COMPILING),true)
 gen: plugins dpf/utils/lv2_ttl_generator
 	@$(CURDIR)/dpf/utils/generate-ttl.sh
diff --git a/dpf b/dpf
index 9b838a6..168e8a5 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 9b838a67d2e07ea72c198e291f7eb654fef541fd
+Subproject commit 168e8a5333c52175a7e94016b3ef994c7b253aa9
diff --git a/plugins/ProM/DistrhoUIProM.cpp b/plugins/ProM/DistrhoUIProM.cpp
index a4f19c7..6f6f47d 100644
--- a/plugins/ProM/DistrhoUIProM.cpp
+++ b/plugins/ProM/DistrhoUIProM.cpp
@@ -98,7 +98,7 @@ void DistrhoUIProM::uiReshape(uint width, uint height)
 
     if (fPM == nullptr)
     {
-#ifdef PROJECTM_PREFIX
+#ifdef PROJECTM_DATA_DIR
         fPM = new projectM(PROJECTM_DATA_DIR "/config.inp");
 #else
         projectM::Settings settings;
@@ -167,13 +167,13 @@ bool DistrhoUIProM::onKeyboard(const KeyboardEvent& ev)
     {
         switch (ev.key)
         {
-        case DGL_NAMESPACE::kCharBackspace:
+        case DGL_NAMESPACE::kKeyBackspace:
             pmKey = PROJECTM_K_BACKSPACE;
             break;
-        case DGL_NAMESPACE::kCharEscape:
+        case DGL_NAMESPACE::kKeyEscape:
             pmKey = PROJECTM_K_ESCAPE;
             break;
-        case DGL_NAMESPACE::kCharDelete:
+        case DGL_NAMESPACE::kKeyDelete:
             pmKey = PROJECTM_K_DELETE;
             break;
         }