From 728646dd98e58dc4ee0a290446d54c1927ecbce4 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 15 Apr 2023 16:38:55 +0200
Subject: [PATCH] Always use verbose carla linkage

Signed-off-by: falkTX <falktx@falktx.com>
---
 carla                      |  2 +-
 plugins/Common/Makefile.mk | 25 +++++++++++++++++++++++--
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/carla b/carla
index 7131a91..04d3e12 160000
--- a/carla
+++ b/carla
@@ -1 +1 @@
-Subproject commit 7131a918b284219ccec13c26b87978dce4f57737
+Subproject commit 04d3e126b48aef0689e97816efb3b817319cc388
diff --git a/plugins/Common/Makefile.mk b/plugins/Common/Makefile.mk
index ae761ae..d9c59aa 100644
--- a/plugins/Common/Makefile.mk
+++ b/plugins/Common/Makefile.mk
@@ -40,11 +40,32 @@ include ../../carla/source/Makefile.deps.mk
 
 # FIXME
 ifeq ($(WASM),true)
+ifneq ($(OLD_PATH),)
 STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm
 endif
+endif
 
-EXTRA_DEPENDENCIES = ../../carla/bin/libcarla_host-plugin.a
-EXTRA_LIBS = ../../carla/bin/libcarla_host-plugin.a $(STATIC_CARLA_PLUGIN_LIBS)
+CARLA_BUILD_DIR = ../../carla/build
+ifeq ($(DEBUG),true)
+CARLA_BUILD_TYPE = Debug
+else
+CARLA_BUILD_TYPE = Release
+endif
+CARLA_EXTRA_LIBS  = $(CARLA_BUILD_DIR)/plugin/$(CARLA_BUILD_TYPE)/carla-host-plugin.cpp.o
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_plugin.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/sfzero.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/ysfx.a
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
+
+EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS)
+EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 
 # ---------------------------------------------------------------------------------------------------------------------
 # Do some more magic