Use new carla single static lib setup

Signed-off-by: falkTX <falktx@falktx.com>

Makefile

@@ -30,7 +30,9 @@ endif
 
 CARLA_EXTRA_ARGS = CARLA_BACKEND_NAMESPACE=Ildaeil \
 	CAN_GENERATE_LV2_TTL=false \
+	CUSTOM_DPF_PATH=$(CURDIR)/dpf \
 	STATIC_PLUGIN_TARGET=true \
+	USING_CUSTOM_DPF=true \
 	HAVE_FFMPEG=false \
 	HAVE_FLUIDSYNTH=false \
 	HAVE_PROJECTM=false \
@@ -49,22 +51,18 @@ CARLA_TARGETS += bridges-plugin bridges-ui
 ifeq ($(CARLA_EXTRA_TARGETS),true)
 
 # 32bit bridge
-ifeq ($(CPU_X86_64),true)
-ifeq ($(WINDOWS),true)
+ifeq ($(WINDOWS)$(CPU_X86_64),truetrue)
 CARLA_TARGETS += win32
 else ifneq ($(MACOS),true)
 CARLA_TARGETS += posix32
 endif
-endif
 
 # native wine bridge
-ifeq ($(CPU_I386_OR_X86_64)$(LINUX),truetrue)
-ifeq ($(CPU_X86_64),true)
-CARLA_TARGETS += wine64
-else
+ifeq ($(LINUX)$(CPU_X86_64),truetrue)
+CARLA_TARGETS += wine32 wine64
+else ifeq ($(LINUX)$(CPU_I386),truetrue)
 CARLA_TARGETS += wine32
 endif
-endif
 
 endif # CARLA_EXTRA_TARGETS
 endif # USE_SYSTEM_CARLA_BINS
@@ -79,7 +77,7 @@ ILDAEIL_SYNTH_ARGS = VST2_FILENAME=Ildaeil.vst/Ildaeil-Synth$(LIB_EXT) CLAP_FILE
 endif
 
 # ---------------------------------------------------------------------------------------------------------------------
-# Check for X11+OpenGL dependencies
+# Check for OpenGL + X11 dependencies
 
 ifneq ($(HAIKU_OR_MACOS_OR_WASM_OR_WINDOWS),true)
 
@@ -156,29 +154,31 @@ install:
 	install -d $(DESTDIR)$(PREFIX)/lib/lv2/Ildaeil-MIDI.lv2
 	install -d $(DESTDIR)$(PREFIX)/lib/lv2/Ildaeil-Synth.lv2
 	install -d $(DESTDIR)$(PREFIX)/lib/vst/Ildaeil.vst
-	install -d $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-FX.vst3/Contents
-	install -d $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-Synth.vst3/Contents
-
-	install -m 644 bin/Ildaeil.clap/*      $(DESTDIR)$(PREFIX)/lib/clap/Ildaeil.clap/
+	install -d $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-FX.vst3/$(VST3_BINARY_DIR)
+	install -d $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-Synth.vst3/$(VST3_BINARY_DIR)
 
 	install -m 644 bin/Ildaeil-FX.lv2/*    $(DESTDIR)$(PREFIX)/lib/lv2/Ildaeil-FX.lv2/
 	install -m 644 bin/Ildaeil-MIDI.lv2/*  $(DESTDIR)$(PREFIX)/lib/lv2/Ildaeil-MIDI.lv2/
 	install -m 644 bin/Ildaeil-Synth.lv2/* $(DESTDIR)$(PREFIX)/lib/lv2/Ildaeil-Synth.lv2/
 
-	install -m 644 bin/Ildaeil.vst/*       $(DESTDIR)$(PREFIX)/lib/vst/Ildaeil.vst/
+	install -m 644 bin/Ildaeil-FX.vst3/$(VST3_BINARY_DIR)/*    $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-FX.vst3/$(VST3_BINARY_DIR)/
+	install -m 644 bin/Ildaeil-Synth.vst3/$(VST3_BINARY_DIR)/* $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-Synth.vst3/$(VST3_BINARY_DIR)/
 
-	cp -rL bin/Ildaeil-FX.vst3/Contents/*-*    $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-FX.vst3/Contents/
-	cp -rL bin/Ildaeil-Synth.vst3/Contents/*-* $(DESTDIR)$(PREFIX)/lib/vst3/Ildaeil-Synth.vst3/Contents/
+ifeq ($(MACOS),true)
+else
+	install -m 644 bin/Ildaeil.clap/*      $(DESTDIR)$(PREFIX)/lib/clap/Ildaeil.clap/
+	install -m 644 bin/Ildaeil.vst/*       $(DESTDIR)$(PREFIX)/lib/vst/Ildaeil.vst/
+endif
 
 # ---------------------------------------------------------------------------------------------------------------------
 
 clean:
 	$(MAKE) $(CARLA_EXTRA_ARGS) distclean -C carla
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_FX_ARGS) clean -C plugins/FX
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_MIDI_ARGS) clean -C plugins/MIDI
+	$(MAKE) $(CARLA_EXTRA_ARGS) $(ILDAEIL_SYNTH_ARGS) clean -C plugins/Synth
 	$(MAKE) clean -C dpf/dgl
 	$(MAKE) clean -C dpf/utils/lv2-ttl-generator
-	$(MAKE) $(ILDAEIL_FX_ARGS) clean -C plugins/FX
-	$(MAKE) $(ILDAEIL_MIDI_ARGS) clean -C plugins/MIDI
-	$(MAKE) $(ILDAEIL_SYNTH_ARGS) clean -C plugins/Synth
 	rm -rf bin build
 	rm -f dpf-widgets/opengl/*.d
 	rm -f dpf-widgets/opengl/*.o
@@ -217,6 +217,7 @@ TAR_ARGS = \
 	--exclude=dpf-widgets/generic \
 	--exclude=dpf-widgets/opengl/Blendish* \
 	--exclude=dpf-widgets/opengl/DearImGuiColorTextEditor* \
+	--exclude=dpf-widgets/opengl/Quantum* \
 	--exclude=dpf-widgets/tests \
 	--transform='s,^\.\.,-.-.,' \
 	--transform='s,^\.,Ildaeil-$(VERSION),' \

carla

@@ -1 +1 @@
-Subproject commit dc9b58b4cb148f5f38654defe19b1fe2556acc21
+Subproject commit 5d0d243be13e2088e2c82d4d0bcc947edcd1b64d

dpf

@@ -1 +1 @@
-Subproject commit ac3f5bce433a5ffbc083d3c62d30eefec8ffd1ec
+Subproject commit 90004b0d43875c3754142114112148b593615352

plugins/Common/Makefile.mk

@@ -6,7 +6,19 @@
 
 # NOTE This file MUST be imported after setting `NAME`
 
-# --------------------------------------------------------------
+ifneq ($(CARLA_BACKEND_NAMESPACE),Ildaeil)
+$(error wrong build setup)
+endif
+
+ifneq ($(STATIC_PLUGIN_TARGET),true)
+$(error wrong build setup)
+endif
+
+ifneq ($(USING_CUSTOM_DPF),true)
+$(error wrong build setup)
+endif
+
+# ---------------------------------------------------------------------------------------------------------------------
 # Files to build
 
 FILES_DSP = \
@@ -17,48 +29,24 @@ FILES_UI = \
 	../Common/PluginHostWindow.cpp \
 	../../dpf-widgets/opengl/DearImGui.cpp
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Carla stuff
 
 ifneq ($(DEBUG),true)
 EXTERNAL_PLUGINS = true
 endif
 
-CWD = ../../carla/source
-include $(CWD)/Makefile.deps.mk
-
-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
-ifneq ($(WASM),true)
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/dgl.a
-CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
-endif
-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
+include ../../carla/source/Makefile.deps.mk
 
 # FIXME
 ifeq ($(WASM),true)
 STATIC_CARLA_PLUGIN_LIBS = -lsndfile -lopus -lFLAC -lvorbisenc -lvorbis -logg -lm
 endif
 
-EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS)
-EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
+EXTRA_DEPENDENCIES = ../../carla/bin/libcarla_host-plugin.a
+EXTRA_LIBS = ../../carla/bin/libcarla_host-plugin.a $(STATIC_CARLA_PLUGIN_LIBS)
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Do some more magic
 
 USE_CLAP_BUNDLE = true
@@ -82,9 +70,10 @@ BUILD_CXX_FLAGS += -I../Common
 BUILD_CXX_FLAGS += -I../../dpf-widgets/generic
 BUILD_CXX_FLAGS += -I../../dpf-widgets/opengl
 
-BUILD_CXX_FLAGS += -DCARLA_BACKEND_NAMESPACE=Ildaeil
-BUILD_CXX_FLAGS += -DREAL_BUILD
+BUILD_CXX_FLAGS += -DCARLA_BACKEND_NAMESPACE=$(CARLA_BACKEND_NAMESPACE)
 BUILD_CXX_FLAGS += -DSTATIC_PLUGIN_TARGET
+
+BUILD_CXX_FLAGS += -DREAL_BUILD
 BUILD_CXX_FLAGS += -I../../carla/source/backend
 BUILD_CXX_FLAGS += -I../../carla/source/includes
 BUILD_CXX_FLAGS += -I../../carla/source/modules
@@ -95,28 +84,28 @@ $(BUILD_DIR)/../Common/PluginHostWindow.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 $(BUILD_DIR)/../Common/SizeUtils.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 endif
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # Enable all possible plugin types
 
-ifeq ($(WASM),true)
-
-TARGETS_EXTRA = jack
-
-else
-
+# base plugin formats to build
 TARGETS_BASE = lv2 vst2 clap
-TARGETS_EXTRA = jack carlabins
 
 # VST3 does not do MIDI filter plugins, by design
 ifneq ($(NAME),Ildaeil-MIDI)
 TARGETS_BASE += vst3
 endif
 
+# add standalone and carlabins, depending on target system
+ifeq ($(WASM),true)
+TARGETS_BASE =
+TARGETS_EXTRA = jack
+else
+TARGETS_EXTRA = jack carlabins
 endif
 
 all: $(TARGETS_BASE) $(TARGETS_EXTRA)
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------
 # special step for carla binaries
 
 ifneq ($(USE_SYSTEM_CARLA_BINS),true)
@@ -162,4 +151,4 @@ carlabins:
 
 endif # USE_SYSTEM_CARLA_BINS
 
-# --------------------------------------------------------------
+# ---------------------------------------------------------------------------------------------------------------------