More work, now builds and installs

Makefile

@@ -147,14 +147,15 @@ install:
 	install -m 644 resources/scalable/carla.svg            $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
 	install -m 644 resources/scalable/carla-control.svg    $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/
 
-	# Install main code
-	install -m 755 source/*.py $(DESTDIR)$(PREFIX)/share/carla/
-
+	# Install binary data
 	install -m 755 \
 		source/backend/*.so \
-		source/bridge/carla-bridge-* \
+		source/bridges/carla-bridge-* \
 		source/discovery/carla-discovery-* \
-		$(DESTDIR)$(PREFIX)/lib/cadence/
+		$(DESTDIR)$(PREFIX)/lib/carla/
+
+	# Install python code
+	install -m 755 source/*.py $(DESTDIR)$(PREFIX)/share/carla/
 
 	# Adjust PREFIX value in script files
 	sed -i "s/X-PREFIX-X/$(SED_PREFIX)/" \

source/backend/Makefile

@@ -4,24 +4,13 @@
 # Created by falkTX
 #
 
-all: carla_standalone
-
-carla_standalone:
-	$(MAKE) -C standalone ../libcarla_standalone.so
-
 # --------------------------------------------------------------
 
-libcarla_engine.%:
-	$(MAKE) -C engine ../$@
-
-libcarla_native.%:
-	$(MAKE) -C native ../$@
-
-libcarla_plugin.%:
-	$(MAKE) -C plugin ../$@
-
-libcarla_standalone.%:
-	$(MAKE) -C standalone ../$@
+all:
+	$(MAKE) -C engine
+	$(MAKE) -C native
+	$(MAKE) -C plugin
+	$(MAKE) -C standalone
 
 # --------------------------------------------------------------
 
@@ -30,3 +19,8 @@ clean:
 	$(MAKE) clean -C native
 	$(MAKE) clean -C plugin
 	$(MAKE) clean -C standalone
+
+# --------------------------------------------------------------
+
+debug:
+	$(MAKE) DEBUG=true

source/backend/engine/Makefile

@@ -9,8 +9,6 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo)
-
-LINK_FLAGS      += -shared
 LINK_FLAGS      += $(shell pkg-config --libs liblo)
 
 # --------------------------------------------------------------
@@ -57,23 +55,26 @@ OBJS += \
 	rtmidi-2.0.1/RtMidi.cpp.o
 endif
 
+SHARED = ../libcarla_engine.so
 STATIC = ../libcarla_engine.a
-TARGET = ../libcarla_engine.so
 
 # --------------------------------------------------------------
 
-all: $(TARGET)
+all: $(STATIC)
 
 clean:
-	rm -f $(OBJS) $(STATIC) $(TARGET)
+	rm -f $(OBJS) $(SHARED) $(STATIC)
+
+debug:
+	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
 %.cpp.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(STATIC): $(OBJS)
-	$(AR) rs $@ $^
+$(SHARED): $(OBJS) $(LIBS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-$(TARGET): $(OBJS)
-	$(CXX) $^ $(LINK_FLAGS) -o $@
+$(STATIC): $(OBJS) $(LIBS)
+	$(AR) rs $@ $^

source/backend/native/Makefile

@@ -10,8 +10,6 @@ include ../Makefile.mk
 
 BUILD_CXX_FLAGS += -I../../libs/distrho-plugin-toolkit
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags QtGui)
-
-LINK_FLAGS      += -shared
 LINK_FLAGS      += $(shell pkg-config --libs QtGui) -lGL
 
 ifeq ($(HAVE_ZYN_DEPS),true)
@@ -41,15 +39,18 @@ OBJS += \
 	zynaddsubfx-src.cpp.o
 endif
 
+SHARED = ../libcarla_native.so
 STATIC = ../libcarla_native.a
-TARGET = ../libcarla_native.so
 
 # --------------------------------------------------------------
 
-all: $(TARGET)
+all: $(STATIC)
 
 clean:
-	rm -f $(OBJS) $(STATIC) $(TARGET)
+	rm -f $(OBJS) $(SHARED) $(STATIC)
+
+debug:
+	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
@@ -59,11 +60,11 @@ clean:
 %.cpp.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(STATIC): $(OBJS)
-	$(AR) rs $@ $^
+$(SHARED): $(OBJS) $(LIBS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-$(TARGET): $(OBJS)
-	$(CXX) $^ $(LINK_FLAGS) -o $@
+$(STATIC): $(OBJS) $(LIBS)
+	$(AR) rs $@ $^
 
 # --------------------------------------------------------------
 

source/backend/plugin/Makefile

@@ -9,8 +9,6 @@ include ../Makefile.mk
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtGui)
-
-LINK_FLAGS      += -shared
 LINK_FLAGS      += $(shell pkg-config --libs liblo QtGui)
 
 ifeq ($(HAVE_SUIL),true)
@@ -43,23 +41,26 @@ OBJS = \
 # 	fluidsynth.cpp.o \
 # 	linuxsampler.cpp.o
 
+SHARED = ../libcarla_plugin.so
 STATIC = ../libcarla_plugin.a
-TARGET = ../libcarla_plugin.so
 
 # --------------------------------------------------------------
 
-all: $(TARGET)
+all: $(STATIC)
 
 clean:
-	rm -f $(OBJS) $(STATIC) $(TARGET)
+	rm -f $(OBJS) $(SHARED) $(STATIC)
+
+debug:
+	$(MAKE) DEBUG=true
 
 # --------------------------------------------------------------
 
 %.cpp.o: %.cpp
 	$(CXX) $< $(BUILD_CXX_FLAGS) -c -o $@
 
-$(STATIC): $(OBJS)
-	$(AR) rs $@ $^
+$(SHARED): $(OBJS) $(LIBS)
+	$(CXX) $^ -shared $(LINK_FLAGS) -o $@
 
-$(TARGET): $(OBJS)
-	$(CXX) $^ $(LINK_FLAGS) -o $@
+$(STATIC): $(OBJS) $(LIBS)
+	$(AR) rs $@ $^

source/backend/plugin/native.cpp

@@ -39,7 +39,7 @@ public:
     NativePlugin(CarlaEngine* const engine, const int id)
         : CarlaPlugin(engine, id)
     {
-        qDebug("NativePlugin::NativePlugin()");
+        qDebug("NativePlugin::NativePlugin(%p, %i)", engine, id);
 
 #if 0
         descriptor  = nullptr;

source/backend/standalone/Makefile

@@ -24,19 +24,9 @@ ifeq ($(HAVE_PULSEAUDIO),true)
 LINK_FLAGS      += $(shell pkg-config --libs libpulse-simple)
 endif
 
-# --------------------------------------------------------------
-# Native
-
-LINK_FLAGS      +=  -lGL
-
-ifeq ($(HAVE_ZYN_DEPS),true)
-LINK_FLAGS      += $(shell pkg-config --libs fftw3 mxml) -lpthread
-endif
-
 # --------------------------------------------------------------
 # Plugin
 
-
 ifeq ($(HAVE_SUIL),true)
 LINK_FLAGS      += $(shell pkg-config --libs suil-0)
 endif
@@ -48,7 +38,15 @@ LINK_FLAGS      += $(shell pkg-config --libs linuxsampler)
 endif
 
 # --------------------------------------------------------------
+# Native
 
+LINK_FLAGS      +=  -lGL
+
+ifeq ($(HAVE_ZYN_DEPS),true)
+LINK_FLAGS      += $(shell pkg-config --libs fftw3 mxml) -lpthread
+endif
+
+# --------------------------------------------------------------
 
 LIBS  = ../libcarla_engine.a
 LIBS += ../libcarla_plugin.a
@@ -57,16 +55,19 @@ LIBS += ../libcarla_native.a
 OBJS  = \
      carla_standalone.cpp.o
 
-STATIC = ../libcarla_standalone.a
 SHARED = ../libcarla_standalone.so
+STATIC = ../libcarla_standalone.a
 
 # --------------------------------------------------------------
 
-all:
+all: $(SHARED)
 
 clean:
 	rm -f $(OBJS) $(SHARED) $(STATIC)
 
+debug:
+	$(MAKE) DEBUG=true
+
 # --------------------------------------------------------------
 
 %.cpp.o: %.cpp
@@ -83,8 +84,8 @@ $(STATIC): $(OBJS) $(LIBS)
 ../libcarla_engine.a:
 	$(MAKE) -C ../engine $@
 
-../libcarla_native.a:
-	$(MAKE) -C ../native $@
-
 ../libcarla_plugin.a:
 	$(MAKE) -C ../plugin $@
+
+../libcarla_native.a:
+	$(MAKE) -C ../native $@

source/bridges/Makefile

@@ -6,13 +6,15 @@
 
 include ../Makefile.mk
 
+# --------------------------------------------------------------
+
 HAVE_GTK2        = $(shell pkg-config --exists gtk+-2.0 && echo true)
 HAVE_GTK3        = $(shell pkg-config --exists gtk+-3.0 && echo true)
 
 # --------------------------------------------------------------
 
 BUILD_CXX_FLAGS += -DBUILD_BRIDGE
-BUILD_CXX_FLAGS += -I. -I../carla-includes -I../carla-utils
+BUILD_CXX_FLAGS += -I. -I../backend -I../includes -I../utils
 BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore QtXml)
 LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore QtXml)
 
@@ -84,7 +86,8 @@ LINK_UI_VST_X11_FLAGS   = $(LINK_UI_FLAGS) $(QT_UI_LIBS)
 # --------------------------------------------------------------
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-all: native ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11
+all: ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11
+# native
 
 ifeq ($(HAVE_GTK2),true)
 ui_lv2-gtk2: carla-bridge-lv2-gtk2
@@ -134,8 +137,8 @@ win64:   carla-bridge-win64.exe
 	$(CXX) $< $(BUILD_UI_VST_FLAGS) -c -o $@
 
 OBJS_UI_LV2_LIBS = \
-	../carla-lilv/carla_lilv.a \
-	../carla-rtmempool/carla_rtmempool.a
+	../libs/lilv.a \
+	../libs/rtmempool.a
 
 # --------------------------------------------------------------
 # ui_lv2-gtk2
@@ -428,35 +431,8 @@ carla-bridge-win64.exe: $(OBJS_WIN64) ../carla-jackbridge/libcarla-jackbridge-wi
 
 # --------------------------------------------------------------
 
-../carla-lilv/carla_lilv.a:
-	$(MAKE) -C ../carla-lilv
-
-../carla-lilv/carla_lilv_posix32.a:
-	$(MAKE) -C ../carla-lilv posix32
-
-../carla-lilv/carla_lilv_posix64.a:
-	$(MAKE) -C ../carla-lilv posix64
-
-../carla-lilv/carla_lilv_win32.a:
-	$(MAKE) -C ../carla-lilv win32
-
-../carla-lilv/carla_lilv_win64.a:
-	$(MAKE) -C ../carla-lilv win64
-
-../carla-rtmempool/carla_rtmempool.a:
-	$(MAKE) -C ../carla-rtmempool
-
-../carla-rtmempool/carla_rtmempool_posix32.a:
-	$(MAKE) -C ../carla-rtmempool posix32
-
-../carla-rtmempool/carla_rtmempool_posix64.a:
-	$(MAKE) -C ../carla-rtmempool posix64
-
-../carla-rtmempool/carla_rtmempool_win32.a:
-	$(MAKE) -C ../carla-rtmempool win32
-
-../carla-rtmempool/carla_rtmempool_win64.a:
-	$(MAKE) -C ../carla-rtmempool win64
+../libs/%:
+	$(MAKE) -C ../libs $*
 
 ../carla-jackbridge/libcarla-jackbridge-win32.dll:
 	$(MAKE) -C ../carla-jackbridge win32

source/bridges/carla_bridge_ui-lv2.cpp

@@ -20,11 +20,16 @@
 #include "carla_bridge_client.hpp"
 #include "carla_lv2_utils.hpp"
 #include "carla_midi.h"
-#include "rtmempool/rtmempool.h"
+
+extern "C" {
+#include "rtmempool/rtmempool-lv2.h"
+}
 
 #include <vector>
 #include <QtCore/QDir>
 
+Lv2WorldClass lv2World;
+
 CARLA_BRIDGE_START_NAMESPACE
 
 // -------------------------------------------------------------------------
@@ -174,7 +179,7 @@ public:
         programsFt->program_changed                = carla_lv2_program_changed;
 
         LV2_RtMemPool_Pool* const rtMemPoolFt      = new LV2_RtMemPool_Pool;
-        rtmempool_allocator_init(rtMemPoolFt);
+        lv2_rtmempool_init(rtMemPoolFt);
 
         LV2_State_Make_Path* const stateMakePathFt = new LV2_State_Make_Path;
         stateMakePathFt->handle                    = this;

source/libs/rtmempool/Makefile

@@ -11,6 +11,10 @@ include ../../Makefile.mk
 BUILD_C_FLAGS += -fvisibility=hidden -fPIC
 BUILD_C_FLAGS += -I. -I../../includes
 
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+BUILD_C_FLAGS += -DWANT_LV2
+endif
+
 OBJS         = rtmempool.o
 OBJS_posix32 = rtmempool_posix32.o
 OBJS_posix64 = rtmempool_posix64.o