Install carla binaries for plugin and ui bridges

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

Makefile

@@ -16,14 +16,33 @@ CARLA_EXTRA_ARGS = \
 	HAVE_FLUIDSYNTH=false \
 	HAVE_PROJECTM=false \
 	HAVE_ZYN_DEPS=false \
-	HAVE_ZYN_UI_DEPS=false
+	HAVE_ZYN_UI_DEPS=false \
+	USING_JUCE=false \
+	USING_JUCE_GUI_EXTRA=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
+# --------------------------------------------------------------
+# Check for X11+OpenGL dependencies
+
+ifneq ($(HAIKU_OR_MACOS_OR_WINDOWS),true)
+
+ifneq ($(HAVE_OPENGL),true)
+$(error OpenGL dependency not installed/available)
+endif
+ifneq ($(HAVE_X11),true)
+$(error X11 dependency not installed/available)
+endif
+ifneq ($(HAVE_XEXT),true)
+$(warning Xext dependency not installed/available)
+endif
+ifneq ($(HAVE_XRANDR),true)
+$(warning Xrandr dependency not installed/available)
+endif
+
+endif
 
 # --------------------------------------------------------------
 

plugins/Common/IldaeilPlugin.cpp

@@ -100,13 +100,21 @@ public:
         fCarlaHostHandle = carla_create_native_plugin_host_handle(fCarlaPluginDescriptor, fCarlaPluginHandle);
         DISTRHO_SAFE_ASSERT_RETURN(fCarlaHostHandle != nullptr,);
 
-#ifdef CARLA_OS_MAC
-        carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/Applications/Carla.app/Contents/MacOS");
-        carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/Applications/Carla.app/Contents/MacOS/resources");
-#else
-        carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/lib/carla");
-        carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/share/carla/resources");
-#endif
+        if (const char* const bundlePath = getBundlePath())
+        {
+            carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, bundlePath);
+            // carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "");
+        }
+        else
+        {
+           #ifdef CARLA_OS_MAC
+            carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/Applications/Carla.app/Contents/MacOS");
+            carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/Applications/Carla.app/Contents/MacOS/resources");
+           #else
+            carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_BINARIES, 0, "/usr/lib/carla");
+            carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PATH_RESOURCES, 0, "/usr/share/carla/resources");
+           #endif
+        }
 
         if (const char* const path = std::getenv("LV2_PATH"))
             carla_set_engine_option(fCarlaHostHandle, ENGINE_OPTION_PLUGIN_PATH, PLUGIN_LV2, path);

plugins/Common/Makefile.mk

@@ -52,6 +52,7 @@ EXTRA_LIBS = $(CARLA_EXTRA_LIBS) $(STATIC_CARLA_PLUGIN_LIBS)
 # --------------------------------------------------------------
 # Do some more magic
 
+USE_VST2_BUNDLE = true
 include ../../dpf/Makefile.plugins.mk
 
 BUILD_CXX_FLAGS += -pthread
@@ -74,6 +75,18 @@ endif
 # --------------------------------------------------------------
 # Enable all possible plugin types
 
-all: jack lv2 vst2 vst3
+all: jack lv2 vst2 vst3 carlabins
+
+# --------------------------------------------------------------
+# special step for carla binaries
+
+CARLA_BINARIES  = $(CURDIR)/../../carla/bin/carla-bridge-native$(APP_EXT)
+CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk2$(APP_EXT)
+CARLA_BINARIES += $(CURDIR)/../../carla/bin/carla-bridge-lv2-gtk3$(APP_EXT)
+
+carlabins: lv2 vst2 vst3
+	install -m 755 $(CARLA_BINARIES) $(shell dirname $(lv2))
+	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst2))
+	install -m 755 $(CARLA_BINARIES) $(shell dirname $(vst3))
 
 # --------------------------------------------------------------