Browse Source

Update carla, enable GUIs for its internal plugins

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.06
falkTX 2 years ago
parent
commit
11d9d6a0be
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
4 changed files with 10 additions and 4 deletions
  1. +0
    -3
      Makefile
  2. +1
    -1
      carla
  3. +6
    -0
      jucewrapper/CMakeLists.txt
  4. +3
    -0
      src/Makefile.cardinal.mk

+ 0
- 3
Makefile View File

@@ -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



+ 1
- 1
carla

@@ -1 +1 @@
Subproject commit f2c60477ee1ffb7d653af04697b991ee19f51320
Subproject commit 8371c3c395e6e4d9d34ea2b0f7e5557eb0171a7a

+ 6
- 0
jucewrapper/CMakeLists.txt View File

@@ -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


+ 3
- 0
src/Makefile.cardinal.mk View File

@@ -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


Loading…
Cancel
Save