From ca7b3cfd28e0669af62f12592a159e7a089f7651 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 26 Jan 2023 16:47:48 +0100
Subject: [PATCH] Set surgext libs for linking before others, needed in some
 systems

Signed-off-by: falkTX <falktx@falktx.com>
---
 src/Makefile.cardinal.mk | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
index 2f8c7b5..b5d208f 100644
--- a/src/Makefile.cardinal.mk
+++ b/src/Makefile.cardinal.mk
@@ -117,7 +117,7 @@ FILES_UI += distrho.rc
 endif
 
 # --------------------------------------------------------------
-# Extra libraries to link against
+# Rack and plugin libs
 
 ifeq ($(HEADLESS),true)
 TARGET_SUFFIX = -headless
@@ -137,24 +137,9 @@ else
 RACK_EXTRA_LIBS += ../rack$(TARGET_SUFFIX).a
 endif
 
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libquickjs.a
-
-ifneq ($(SYSDEPS),true)
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libjansson.a
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libsamplerate.a
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libspeexdsp.a
-ifeq ($(WINDOWS),true)
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive_static.a
-else
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive.a
-endif
-RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libzstd.a
-endif
-
 # --------------------------------------------------------------
 # surgext libraries
 
-ifneq ($(CARDINAL_VARIANT),mini)
 ifneq ($(NOPLUGINS),true)
 SURGE_DEP_PATH = $(abspath ../../deps/surge-build)
 RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/src/common/libsurge-common.a
@@ -174,6 +159,26 @@ endif
 RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/strnatcmp/libstrnatcmp.a
 RACK_EXTRA_LIBS += $(SURGE_DEP_PATH)/libs/sst/sst-plugininfra/libs/tinyxml/libtinyxml.a
 endif
+
+# --------------------------------------------------------------
+# Extra libraries to link against
+
+ifneq ($(CARDINAL_VARIANT),mini)
+ifneq ($(NOPLUGINS),true)
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libquickjs.a
+endif
+endif
+
+ifneq ($(SYSDEPS),true)
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libjansson.a
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libsamplerate.a
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libspeexdsp.a
+ifeq ($(WINDOWS),true)
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive_static.a
+else
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libarchive.a
+endif
+RACK_EXTRA_LIBS += $(DEP_LIB_PATH)/libzstd.a
 endif
 
 # --------------------------------------------------------------
@@ -188,11 +193,13 @@ endif
 EXTRA_DSP_DEPENDENCIES = $(RACK_EXTRA_LIBS) $(CARLA_EXTRA_LIBS)
 EXTRA_DSP_LIBS = $(RACK_EXTRA_LIBS) $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 
+ifneq ($(CARDINAL_VARIANT),mini)
 ifeq ($(shell $(PKG_CONFIG) --exists fftw3f && echo true),true)
 EXTRA_DSP_DEPENDENCIES += ../../deps/aubio/libaubio.a
 EXTRA_DSP_LIBS += ../../deps/aubio/libaubio.a
 EXTRA_DSP_LIBS += $(shell $(PKG_CONFIG) --libs fftw3f)
 endif
+endif
 
 ifneq ($(NOPLUGINS),true)
 ifeq ($(MACOS),true)