Only build required carla things

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

Makefile

@@ -8,10 +8,27 @@ include dpf/Makefile.base.mk
 
 all: carla dgl plugins gen
 
+# --------------------------------------------------------------
+# Carla config
+
+CARLA_EXTRA_ARGS = \
+	HAVE_FFMPEG=false \
+	HAVE_FLUIDSYNTH=false \
+	HAVE_PROJECTM=false \
+	HAVE_ZYN_DEPS=false \
+	HAVE_ZYN_UI_DEPS=false
+
+ifneq ($(DEBUG),true)
+CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
+endif
+
+CARLA_EXTRA_ARGS += USING_JUCE=false
+CARLA_EXTRA_ARGS += USING_JUCE_GUI_EXTRA=false
+
 # --------------------------------------------------------------
 
 carla:
-	$(MAKE) -C carla plugin \
+	$(MAKE) static-plugin -C carla $(CARLA_EXTRA_ARGS) \
 		CAN_GENERATE_LV2_TTL=false \
 		STATIC_PLUGIN_TARGET=true
 

plugins/Common/Makefile.mk

@@ -20,6 +20,10 @@ FILES_UI = \
 # --------------------------------------------------------------
 # Carla stuff
 
+ifneq ($(DEBUG),true)
+EXTERNAL_PLUGINS = true
+endif
+
 CWD = ../../carla/source
 include $(CWD)/Makefile.deps.mk
 
@@ -30,42 +34,20 @@ else
 CARLA_BUILD_TYPE = Release
 endif
 
-EXTRA_LIBS  = $(CARLA_BUILD_DIR)/plugin/$(CARLA_BUILD_TYPE)/carla-host-plugin.cpp.o
-ifneq ($(MACOS),true)
-EXTRA_LIBS += -Wl,--start-group -Wl,--whole-archive
-endif
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_plugin.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_plugin.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/native-plugins.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/audio_decoder.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jackbridge.min.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/lilv.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/rtmempool.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/sfzero.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/water.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/zita-resampler.a
-# EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/eel2.a
-# EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/jsusfx.a
-ifeq ($(USING_JUCE),true)
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_audio_basics.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_audio_processors.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_core.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_data_structures.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_events.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_graphics.a
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_gui_basics.a
-ifeq ($(USING_JUCE_GUI_EXTRA),true)
-EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/juce_gui_extra.a
-endif
-endif
-ifneq ($(MACOS),true)
-EXTRA_LIBS += -Wl,--no-whole-archive -Wl,--end-group
-endif
-
-# FIXME patch fluidsynth package
-ifeq ($(WIN32),true)
-STATIC_CARLA_PLUGIN_LIBS += -ldsound -lwinmm
-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)/zita-resampler.a
+
+EXTRA_DEPENDENCIES = $(CARLA_EXTRA_LIBS)
+EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 
 # --------------------------------------------------------------
 # Do some more magic
@@ -84,19 +66,11 @@ BUILD_CXX_FLAGS += -I../../carla/source/includes
 BUILD_CXX_FLAGS += -I../../carla/source/modules
 BUILD_CXX_FLAGS += -I../../carla/source/utils
 
-EXTRA_LIBS += $(STATIC_CARLA_PLUGIN_LIBS)
-
 ifeq ($(MACOS),true)
 $(BUILD_DIR)/../Common/PluginHostWindow.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 $(BUILD_DIR)/../Common/SizeUtils.cpp.o: BUILD_CXX_FLAGS += -ObjC++
 endif
 
-# TODO Find if carla is installed system-wide and use its binaries (assumed yes for now)
-#      Otherwise we need to ship the bridge binaries ourselves, this is not done yet
-
-# BUILD_CXX_FLAGS += $(shell pkg-config --cflags carla-host-plugin carla-native-plugin carla-utils)
-# LINK_FLAGS      += $(shell pkg-config --libs carla-host-plugin carla-native-plugin carla-utils)
-
 # --------------------------------------------------------------
 # Enable all possible plugin types