From 27aa1e94d9317a12a58b003817b35c0c38c4c314 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 16 Oct 2021 00:10:41 +0100
Subject: [PATCH] Fix build with latest DPF

---
 dpf                       |  2 +-
 plugins/Cardinal/Makefile | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dpf b/dpf
index 65eb8c0..2711cbe 160000
--- a/dpf
+++ b/dpf
@@ -1 +1 @@
-Subproject commit 65eb8c098d6ed2c3407b761e8b967f82e0a7b8a7
+Subproject commit 2711cbefa481c3ebed1ca9dbda190bf915d8b0b9
diff --git a/plugins/Cardinal/Makefile b/plugins/Cardinal/Makefile
index c803a66..5be1fec 100644
--- a/plugins/Cardinal/Makefile
+++ b/plugins/Cardinal/Makefile
@@ -50,16 +50,18 @@ FILES_DSP += $(wildcard Rack/src/*/*.c)
 FILES_DSP += $(filter-out Rack/src/dep.cpp Rack/src/discord.cpp Rack/src/gamepad.cpp Rack/src/network.cpp Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp))
 FILES_DSP += $(filter-out Rack/src/window/Window.cpp, $(wildcard Rack/src/*/*.cpp))
 
-EXTRA_LIBS += Rack/dep/lib/libjansson.a
-EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
+EXTRA_DEPENDENCIES += Rack/dep/lib/libjansson.a
+EXTRA_DEPENDENCIES += Rack/dep/lib/libspeexdsp.a
 
 ifeq ($(WINDOWS),true)
-EXTRA_LIBS += Rack/dep/lib/libarchive_static.a
+EXTRA_DEPENDENCIES += Rack/dep/lib/libarchive_static.a
 else
-EXTRA_LIBS += Rack/dep/lib/libarchive.a
+EXTRA_DEPENDENCIES += Rack/dep/lib/libarchive.a
 endif
 
-EXTRA_LIBS += Rack/dep/lib/libzstd.a
+EXTRA_DEPENDENCIES += Rack/dep/lib/libzstd.a
+
+EXTRA_LIBS = $(EXTRA_DEPENDENCIES)
 
 # --------------------------------------------------------------
 # Do some magic