Make lv2-single part of bridge build, since it needs bridge code

source/backend/engine/CarlaEngineThread.cpp

@@ -40,23 +40,21 @@ CarlaEngineThread::~CarlaEngineThread() noexcept
 
 void CarlaEngineThread::run() noexcept
 {
-    // FIXME carla-lv2-single using build-bridge!
     CARLA_SAFE_ASSERT_RETURN(kEngine != nullptr,);
+#ifndef BUILD_BRIDGE
+    CARLA_SAFE_ASSERT(kEngine->isRunning());
+#endif
+    carla_debug("CarlaEngineThread::run()");
 
 #ifdef HAVE_LIBLO
     const bool isPlugin(kEngine->getType() == kEngineTypePlugin);
 #endif
     float value;
 
-#ifndef BUILD_BRIDGE
-    CARLA_SAFE_ASSERT(kEngine->isRunning() || isPlugin);
-#endif
-    carla_debug("CarlaEngineThread::run()");
-
 #ifdef BUILD_BRIDGE
-    for (; /*kEngine->isRunning() &&*/ ! shouldThreadExit();)
+    for (; ! shouldThreadExit();)
 #else
-    for (; (kEngine->isRunning() || isPlugin) && ! shouldThreadExit();)
+    for (; kEngine->isRunning() && ! shouldThreadExit();)
 #endif
     {
 #if defined(HAVE_LIBLO) && ! defined(BUILD_BRIDGE)

source/backend/plugin/CarlaPlugin.cpp

@@ -1125,7 +1125,7 @@ bool CarlaPlugin::exportAsLV2(const char* const lv2path)
 
     const CarlaString binaryFilename(bundlepath + CARLA_OS_SEP_STR + symbol + ".so");
 
-    const File binaryFileSource(File::getSpecialLocation(File::currentExecutableFile).getSiblingFile("carla-lv2-single.so"));
+    const File binaryFileSource(File::getSpecialLocation(File::currentExecutableFile).getSiblingFile("carla-bridge-lv2.so"));
     const File binaryFileTarget(binaryFilename.buffer());
 
     if (! binaryFileSource.createSymbolicLink(binaryFileTarget, true))

source/bridges-plugin/Makefile

@@ -8,7 +8,7 @@ CWD=..
 MODULENAME=carla-bridge
 include $(CWD)/Makefile.mk
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 BINDIR    := $(CWD)/../bin
 
@@ -20,7 +20,7 @@ OBJDIR    := $(CWD)/../build/bridges-plugin/Release
 MODULEDIR := $(CWD)/../build/modules/Release
 endif
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -DBUILD_BRIDGE -I. -I$(CWD) -I$(CWD)/backend -I$(CWD)/includes -I$(CWD)/utils -isystem $(CWD)/modules
 BUILD_CXX_FLAGS += -I$(CWD)/backend/engine -I$(CWD)/backend/plugin
@@ -33,7 +33,7 @@ endif
 32BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 64BIT_FLAGS += -DBUILD_BRIDGE_ALTERNATIVE_ARCH
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 LIBS_native   = $(MODULEDIR)/jackbridge.a
 LIBS_posix32  = $(MODULEDIR)/jackbridge.posix32.a
@@ -129,7 +129,7 @@ ifeq ($(UNIX),true)
 LINK_FLAGS += -ldl -lpthread
 endif
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 NATIVE_BUILD_FLAGS  = $(NATIVE_PLUGINS_FLAGS)
 NATIVE_LINK_FLAGS   =
@@ -154,7 +154,7 @@ ifeq ($(HAVE_DGL),true)
 LIBS_native        += $(MODULEDIR)/dgl.a
 endif
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 OBJS_native = \
 	$(OBJDIR)/CarlaBridgePlugin.cpp.o \
@@ -182,6 +182,9 @@ OBJS_native = \
 	$(OBJDIR)/CarlaPluginLinuxSampler.cpp.o \
 	$(OBJDIR)/CarlaStandalone.cpp.o
 
+OBJS_lv2 = $(OBJS_native) \
+	$(OBJDIR)/CarlaBridgeLV2.cpp.o
+
 OBJS_arch = \
 	$(OBJDIR)/CarlaBridgePlugin.cpp.arch.o \
 	$(OBJDIR)/CarlaEngine.cpp.arch.o \
@@ -210,11 +213,11 @@ OBJS_posix64 = $(OBJS_arch:%.arch.o=%.posix64.o)
 OBJS_win32   = $(OBJS_arch:%.arch.o=%.win32.o)
 OBJS_win64   = $(OBJS_arch:%.arch.o=%.win64.o)
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 all: native
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
 clean:
 	rm -f $(OBJDIR)/*.o
@@ -226,15 +229,15 @@ clean:
 debug:
 	$(MAKE) DEBUG=true
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
-native:  $(BINDIR)/$(MODULENAME)-native$(APP_EXT)
+native:  $(BINDIR)/$(MODULENAME)-native$(APP_EXT) $(BINDIR)/$(MODULENAME)-lv2$(LIB_EXT)
 posix32: $(BINDIR)/$(MODULENAME)-posix32
 posix64: $(BINDIR)/$(MODULENAME)-posix64
 win32:   $(BINDIR)/$(MODULENAME)-win32.exe
 win64:   $(BINDIR)/$(MODULENAME)-win64.exe
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # linking
 
 $(BINDIR)/$(MODULENAME)-native$(APP_EXT): $(OBJS_native) $(LIBS_native)
@@ -242,6 +245,11 @@ $(BINDIR)/$(MODULENAME)-native$(APP_EXT): $(OBJS_native) $(LIBS_native)
 	@echo "Linking $(MODULENAME)-native$(APP_EXT)"
 	@$(CXX) $(OBJS_native) $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
 
+$(BINDIR)/$(MODULENAME)-lv2$(LIB_EXT): $(OBJS_lv2) $(LIBS_native)
+	-@mkdir -p $(BINDIR)
+	@echo "Linking $(MODULENAME)-lv2$(LIB_EXT)"
+	@$(CXX) $(OBJS_lv2) $(LIBS_START) $(LIBS_native) $(LIBS_END) $(LINK_FLAGS) $(NATIVE_LINK_FLAGS) -o $@
+
 $(BINDIR)/$(MODULENAME)-posix32: $(OBJS_posix32) $(LIBS_posix32)
 	-@mkdir -p $(BINDIR)
 	@echo "Linking $(MODULENAME)-posix32"
@@ -262,9 +270,14 @@ $(BINDIR)/$(MODULENAME)-win64.exe: $(OBJS_win64) $(LIBS_win64)
 	@echo "Linking $(MODULENAME)-win64.exe"
 	@$(CXX) $(OBJS_win64) $(LIBS_START) $(LIBS_win64) $(LIBS_END) $(LINK_FLAGS) $(64BIT_FLAGS) -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # native
 
+$(OBJDIR)/CarlaBridgeLV2.cpp.o: CarlaBridgeLV2.cpp
+	-@mkdir -p $(OBJDIR)
+	@echo "Compiling $<"
+	@$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
+
 $(OBJDIR)/CarlaBridgePlugin.cpp.o: CarlaBridgePlugin.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $<"
@@ -285,7 +298,7 @@ $(OBJDIR)/CarlaStandalone.cpp.o: $(CWD)/backend/CarlaStandalone.cpp
 	@echo "Compiling CarlaStandalone.cpp (bridge)"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(NATIVE_BUILD_FLAGS) -c -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # posix32
 
 $(OBJDIR)/CarlaBridgePlugin.cpp.posix32.o: CarlaBridgePlugin.cpp
@@ -308,7 +321,7 @@ $(OBJDIR)/CarlaStandalone.cpp.posix32.o: $(CWD)/backend/CarlaStandalone.cpp
 	@echo "Compiling CarlaStandalone.cpp (posix32 bridge)"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # posix64
 
 $(OBJDIR)/CarlaBridgePlugin.cpp.posix64.o: CarlaBridgePlugin.cpp
@@ -331,7 +344,7 @@ $(OBJDIR)/CarlaStandalone.cpp.posix64.o: $(CWD)/backend/CarlaStandalone.cpp
 	@echo "Compiling CarlaStandalone.cpp (posix64 bridge)"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # win32
 
 $(OBJDIR)/CarlaBridgePlugin.cpp.win32.o: CarlaBridgePlugin.cpp
@@ -354,7 +367,7 @@ $(OBJDIR)/CarlaStandalone.cpp.win32.o: $(CWD)/backend/CarlaStandalone.cpp
 	@echo "Compiling CarlaStandalone.cpp (win32 bridge)"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 # win64
 
 $(OBJDIR)/CarlaBridgePlugin.cpp.win64.o: CarlaBridgePlugin.cpp
@@ -377,12 +390,12 @@ $(OBJDIR)/CarlaStandalone.cpp.win64.o: $(CWD)/backend/CarlaStandalone.cpp
 	@echo "Compiling CarlaStandalone.cpp (win64 bridge)"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------
 
--include $(OBJS_native:%.o=%.d)
+-include $(OBJS_lv2:%.o=%.d)
 -include $(OBJS_posix32:%.o=%.d)
 -include $(OBJS_posix64:%.o=%.d)
 -include $(OBJS_win32:%.o=%.d)
 -include $(OBJS_win64:%.o=%.d)
 
-# ----------------------------------------------------------------------------------------------------------------------------
+# ----------------------------------------------------------------------------------------------------------------------

source/plugin/Makefile

@@ -119,7 +119,6 @@ endif
 # ----------------------------------------------------------------------------------------------------------------------------
 
 TARGETS = \
-	$(BINDIR)/carla-lv2-single$(LIB_EXT) \
 	$(BINDIR)/carla.lv2/carla$(LIB_EXT) \
 	$(BINDIR)/carla.lv2/manifest.ttl
 
@@ -146,18 +145,12 @@ clean:
 	rm -f $(OBJDIR)/*.o $(TARGETS)
 	rm -f $(BINDIR)/carla.lv2/*.*
 	rm -f $(BINDIR)/carla-lv2-export$(APP_EXT)
-	rm -f $(BINDIR)/carla-lv2-single$(LIB_EXT)
 
 debug:
 	$(MAKE) DEBUG=true
 
 # ----------------------------------------------------------------------------------------------------------------------------
 
-$(BINDIR)/carla-lv2-single$(LIB_EXT): $(OBJDIR)/carla-lv2-single.cpp.o $(LIBS)
-	-@mkdir -p $(BINDIR)
-	@echo "Linking carla-lv2-single$(LIB_EXT)"
-	@$(CXX) $< $(LIBS_START) $(LIBS) $(LIBS_END) $(SHARED) $(LINK_FLAGS) -o $@
-
 $(BINDIR)/carla.lv2/carla$(LIB_EXT): $(OBJDIR)/carla-lv2.cpp.o $(LIBS)
 	-@mkdir -p $(BINDIR)/carla.lv2
 	@echo "Linking carla.lv2/carla$(LIB_EXT)"
@@ -195,11 +188,6 @@ $(OBJDIR)/carla-lv2.cpp.o: carla-lv2.cpp
 	@echo "Compiling $<"
 	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(OBJDIR)/carla-lv2-single.cpp.o: carla-lv2-single.cpp
-	-@mkdir -p $(OBJDIR)
-	@echo "Compiling $<"
-	@$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
-
 $(OBJDIR)/carla-vst.cpp.rack-fx.o: carla-vst.cpp
 	-@mkdir -p $(OBJDIR)
 	@echo "Compiling $< (RackFX)"