From 59e3d5a6d4b91ae51305cad9d2d62646d575ef98 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 15 Apr 2023 16:35:48 +0200 Subject: [PATCH] Always use verbose carla linkage Signed-off-by: falkTX --- carla | 2 +- dpf | 2 +- src/Makefile.cardinal.mk | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/carla b/carla index 56468b4..04d3e12 160000 --- a/carla +++ b/carla @@ -1 +1 @@ -Subproject commit 56468b473205185bf120619c23b3d594513f4b7b +Subproject commit 04d3e126b48aef0689e97816efb3b817319cc388 diff --git a/dpf b/dpf index 784309e..5b76705 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 784309eba858176d006182566bed4bc91eb7a069 +Subproject commit 5b7670584d16e76a27cf0d6575b8bf9921de2714 diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk index 29ea055..9598e58 100644 --- a/src/Makefile.cardinal.mk +++ b/src/Makefile.cardinal.mk @@ -27,10 +27,6 @@ ifneq ($(STATIC_BUILD),true) STATIC_PLUGIN_TARGET = true include ../../carla/source/Makefile.deps.mk -ifneq ($(WINDOWS),true) -CARLA_EXTRA_LIBS = ../../carla/bin/libcarla_host-plugin.a -else -# workaround mingw linker bug CARLA_BUILD_DIR = ../../carla/build ifeq ($(DEBUG),true) CARLA_BUILD_TYPE = Debug @@ -49,7 +45,6 @@ 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 -endif endif # STATIC_BUILD endif # CARDINAL_VARIANT mini