Update carla, enable GUIs for its internal plugins

Signed-off-by: falkTX <falktx@falktx.com>
CryptoneanLabs · May 26, 2022 · 11d9d6a · 11d9d6a
1 parent dfc59c9
commit 11d9d6a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -54,9 +54,6 @@ ifneq ($(DEBUG),true)
 CARLA_EXTRA_ARGS += EXTERNAL_PLUGINS=true
 endif
 
-CARLA_EXTRA_ARGS += USING_JUCE=false
-CARLA_EXTRA_ARGS += USING_JUCE_GUI_EXTRA=false
-
 # --------------------------------------------------------------
 # DGL config
 

diff --git a/carla b/carla
diff --git a/jucewrapper/CMakeLists.txt b/jucewrapper/CMakeLists.txt
@@ -28,6 +28,9 @@ set_property(TARGET native_plugins PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_
 add_library(audio_decoder STATIC IMPORTED)
 set_property(TARGET audio_decoder PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/audio_decoder.a")
 
+add_library(carla_dgl STATIC IMPORTED)
+set_property(TARGET carla_dgl PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/dgl.a")
+
 add_library(jackbridge STATIC IMPORTED)
 set_property(TARGET jackbridge PROPERTY IMPORTED_LOCATION "${PROJECT_SOURCE_DIR}/../carla/build/modules/Release/jackbridge.min.a")
 
@@ -170,6 +173,7 @@ target_link_libraries(Cardinal
         carla_plugin
         native_plugins
         audio_decoder
+        carla_dgl
         jackbridge
         lilv
         rtmempool
@@ -260,6 +264,7 @@ target_link_libraries(CardinalFX
         carla_plugin
         native_plugins
         audio_decoder
+        carla_dgl
         jackbridge
         lilv
         rtmempool
@@ -350,6 +355,7 @@ target_link_libraries(CardinalSynth
         carla_plugin
         native_plugins
         audio_decoder
+        carla_dgl
         jackbridge
         lilv
         rtmempool

diff --git a/src/Makefile.cardinal.mk b/src/Makefile.cardinal.mk
@@ -38,6 +38,9 @@ CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/carla_engine_
 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 ($(HEADLESS),true)
+CARLA_EXTRA_LIBS += $(CARLA_BUILD_DIR)/modules/$(CARLA_BUILD_TYPE)/dgl.a
+endif
 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
+1 −1		source/Makefile.deps.mk
+1 −0		source/Makefile.mk
+23 −23		source/backend/plugin/CarlaPluginVST2.cpp
+2,012 −57		source/backend/plugin/CarlaPluginVST3.cpp
+5 −1		source/backend/plugin/Makefile
+15 −0		source/bridges-plugin/Makefile
+3 −3		source/discovery/carla-discovery.cpp
+1 −1		source/modules/distrho/DistrhoUIMain.cpp
+8 −16		source/modules/distrho/src/DistrhoPluginCarla.cpp
+1 −1		source/native-plugins/external