Continue rework, fix carla-bridges build

Makefile

@@ -173,10 +173,10 @@ src/resources_rc.py: resources/resources.qrc
 
 # ------------------------------------------------------------------------------------------------------------------------------------------------------
 
-# CPP: carla-backend carla-bridge carla-discovery
-CPP: carla-discovery jackmeter xycontroller
+# CPP: carla-backend carla-discovery
+CPP: carla-bridge carla-discovery jackmeter xycontroller
 
-carla-backend: carla-lilv carla-rtmempool
+carla-backend: carla-lilv carla-native carla-rtmempool
 	$(MAKE) -C c++/carla-backend
 
 carla-bridge: carla-lilv carla-rtmempool
@@ -188,6 +188,9 @@ carla-discovery: carla-lilv
 carla-lilv:
 	$(MAKE) -C c++/carla-lilv
 
+carla-native:
+	$(MAKE) -C c++/carla-native
+
 carla-rtmempool:
 	$(MAKE) -C c++/carla-rtmempool
 

c++/carla-bridge/Makefile

@@ -4,26 +4,26 @@
 # Created by falkTX
 #
 
-CXX   ?= g++
-STRIP ?= strip
+include ../Makefile.mk
 
-BASE_FLAGS   = -O2 -ffast-math -fomit-frame-pointer -mtune=generic -msse -mfpmath=sse -Wall
+BUILD_CXX_FLAGS += -DBUILD_BRIDGE
+BUILD_CXX_FLAGS += -I. -I../carla-includes -I../carla-utils
+BUILD_CXX_FLAGS += $(shell pkg-config --cflags liblo QtCore)
+LINK_FLAGS      += $(shell pkg-config --libs liblo QtCore)
 
-BUILD_FLAGS  = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS)
-BUILD_FLAGS += -I. -I../carla-includes $(shell pkg-config --cflags liblo QtCore)
-BUILD_FLAGS += -DBUILD_BRIDGE -DQT_NO_DEBUG -DQT_NO_DEBUG_STREAM -DQT_NO_DEBUG_OUTPUT -DNDEBUG
-
-BUILD_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
-BUILD_FLAGS += -DVESTIGE_HEADER # Comment this line to not use vestige header
-
-32BIT_FLAGS  = -m32
-64BIT_FLAGS  = -m64
-LINK_FLAGS   = $(shell pkg-config --libs liblo QtCore) $(LDFLAGS)
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+BUILD_CXX_FLAGS += -DWANT_LADSPA -DWANT_DSSI -DWANT_LV2 -DWANT_VST
+endif
 
 # --------------------------------------------------------------
+# Plugin bridges
 
-BUILD_PLUGIN_FLAGS = $(BUILD_FLAGS) -DBUILD_BRIDGE_PLUGIN -DCARLA_ENGINE_JACK -I../carla-backend -I../carla-jackbridge $(shell pkg-config --cflags jack QtGui)
-LINK_PLUGIN_FLAGS  = $(LINK_FLAGS) $(shell pkg-config --libs QtGui)
+BUILD_PLUGIN_FLAGS  = $(BUILD_CXX_FLAGS)
+BUILD_PLUGIN_FLAGS += -DBUILD_BRIDGE_PLUGIN -DCARLA_ENGINE_JACK -I../carla-backend -I../carla-jackbridge
+BUILD_PLUGIN_FLAGS += $(shell pkg-config --cflags jack QtGui)
+
+LINK_PLUGIN_FLAGS   = $(LINK_FLAGS)
+LINK_PLUGIN_FLAGS  += $(shell pkg-config --libs QtGui)
 
 POSIX_BUILD_FLAGS  = $(BUILD_PLUGIN_FLAGS)
 POSIX_32BIT_FLAGS  = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu
@@ -33,36 +33,39 @@ POSIX_LINK_FLAGS   = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl
 WIN_BUILD_FLAGS    = $(BUILD_PLUGIN_FLAGS) -DPTW32_STATIC_LIB
 WIN_32BIT_FLAGS    = $(32BIT_FLAGS)
 WIN_64BIT_FLAGS    = $(64BIT_FLAGS)
-WIN_LINK_FLAGS     = $(LINK_PLUGIN_FLAGS) -mwindows -L../carla-jackbridge -lpthread
+WIN_LINK_FLAGS     = $(LINK_PLUGIN_FLAGS) -static -mwindows -L../carla-jackbridge -lpthread
 
 # --------------------------------------------------------------
+# UI bridges
 
-BUILD_UI_FLAGS = $(BUILD_FLAGS) -DBUILD_BRIDGE_UI
+BUILD_UI_FLAGS = $(BUILD_CXX_FLAGS) -DBUILD_BRIDGE_UI
 LINK_UI_FLAGS  = $(LINK_FLAGS) -ldl
 
-BUILD_UI_LV2_GTK2_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_GTK2 $(shell pkg-config --cflags gtk+-2.0)
+BUILD_UI_LV2_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2
+BUILD_UI_VST_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_VST
+
+BUILD_UI_LV2_GTK2_FLAGS = $(BUILD_UI_LV2_FLAGS) -DBRIDGE_LV2_GTK2 $(shell pkg-config --cflags gtk+-2.0)
 LINK_UI_LV2_GTK2_FLAGS  = $(LINK_UI_FLAGS) $(shell pkg-config --libs gtk+-2.0)
 
-BUILD_UI_LV2_GTK3_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_GTK3 $(shell pkg-config --cflags gtk+-3.0)
+BUILD_UI_LV2_GTK3_FLAGS = $(BUILD_UI_LV2_FLAGS) -DBRIDGE_LV2_GTK3 $(shell pkg-config --cflags gtk+-3.0)
 LINK_UI_LV2_GTK3_FLAGS  = $(LINK_UI_FLAGS) $(shell pkg-config --libs gtk+-3.0)
 
-BUILD_UI_LV2_QT4_FLAGS  = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_QT4 $(shell pkg-config --cflags QtGui)
+BUILD_UI_LV2_QT4_FLAGS  = $(BUILD_UI_LV2_FLAGS) -DBRIDGE_LV2_QT4 $(shell pkg-config --cflags QtGui)
 LINK_UI_LV2_QT4_FLAGS   = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)
 
-BUILD_UI_LV2_X11_FLAGS  = $(BUILD_UI_FLAGS) -DBRIDGE_LV2 -DBRIDGE_LV2_X11 $(shell pkg-config --cflags QtGui)
+BUILD_UI_LV2_X11_FLAGS  = $(BUILD_UI_LV2_FLAGS) -DBRIDGE_LV2_X11 $(shell pkg-config --cflags QtGui)
 LINK_UI_LV2_X11_FLAGS   = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)
 
-BUILD_UI_VST_HWND_FLAGS = $(BUILD_UI_FLAGS) -DBRIDGE_VST -DBRIDGE_VST_HWND $(shell pkg-config --cflags QtGui)
+BUILD_UI_VST_HWND_FLAGS = $(BUILD_UI_VST_FLAGS) -DBRIDGE_VST_HWND $(shell pkg-config --cflags QtGui)
 LINK_UI_VST_HWND_FLAGS  = $(LINK_FLAGS) $(shell pkg-config --libs QtGui) -mwindows -static
 
-BUILD_UI_VST_X11_FLAGS  = $(BUILD_UI_FLAGS) -DBRIDGE_VST -DBRIDGE_VST_X11 $(shell pkg-config --cflags QtGui)
+BUILD_UI_VST_X11_FLAGS  = $(BUILD_UI_VST_FLAGS) -DBRIDGE_VST_X11 $(shell pkg-config --cflags QtGui)
 LINK_UI_VST_X11_FLAGS   = $(LINK_UI_FLAGS) $(shell pkg-config --libs QtGui)
 
 # --------------------------------------------------------------
 
-all: ui
-
-ui: ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-x11 ui_vst-x11
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+all: ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-x11 ui_vst-x11
 
 ifeq ($(shell pkg-config --exists gtk+-2.0 && echo true),true)
 ui_lv2-gtk2: carla-bridge-lv2-gtk2
@@ -81,6 +84,10 @@ ui_lv2-x11:  carla-bridge-lv2-x11
 ui_vst-hwnd: carla-bridge-vst-hwnd.exe
 ui_vst-x11:  carla-bridge-vst-x11
 
+else # CARLA_PLUGIN_SUPPORT
+all:
+endif
+
 # --------------------------------------------------------------
 
 posix32: carla-bridge-posix32
@@ -88,11 +95,20 @@ posix64: carla-bridge-posix64
 win32:   carla-bridge-win32.exe
 win64:   carla-bridge-win64.exe
 
+# --------------------------------------------------------------
+# common
+
+carla_bridge_osc__lv2.o: carla_bridge_osc.cpp
+	$(CXX) $< $(BUILD_UI_LV2_FLAGS) -c -o $@
+
+carla_bridge_osc__vst.o: carla_bridge_osc.cpp
+	$(CXX) $< $(BUILD_UI_VST_FLAGS) -c -o $@
+
 # --------------------------------------------------------------
 # ui_lv2-gtk2
 
 OBJS_UI_LV2_GTK2 = \
-	carla_bridge_ui-lv2__lv2-gtk2.o carla_bridge_toolkit-gtk2__lv2-gtk2.o carla_bridge_osc__lv2-gtk2.o \
+	carla_bridge_ui-lv2__lv2-gtk2.o carla_bridge_toolkit-gtk2__lv2-gtk2.o carla_bridge_osc__lv2.o \
 	../carla-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a
 
 carla-bridge-lv2-gtk2: $(OBJS_UI_LV2_GTK2)
@@ -104,14 +120,11 @@ carla_bridge_ui-lv2__lv2-gtk2.o: carla_bridge_ui-lv2.cpp
 carla_bridge_toolkit-gtk2__lv2-gtk2.o: carla_bridge_toolkit-gtk2.cpp
 	$(CXX) $< $(BUILD_UI_LV2_GTK2_FLAGS) -c -o $@
 
-carla_bridge_osc__lv2-gtk2.o: carla_bridge_osc.cpp
-	$(CXX) $< $(BUILD_UI_LV2_GTK2_FLAGS) -c -o $@
-
 # --------------------------------------------------------------
 # ui_lv2-gtk3
 
 OBJS_UI_LV2_GTK3 = \
-	carla_bridge_ui-lv2__lv2-gtk3.o carla_bridge_toolkit-gtk3__lv2-gtk3.o carla_bridge_osc__lv2-gtk3.o \
+	carla_bridge_ui-lv2__lv2-gtk3.o carla_bridge_toolkit-gtk3__lv2-gtk3.o carla_bridge_osc__lv2.o \
 	../carla-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a
 
 carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3)
@@ -130,7 +143,7 @@ carla_bridge_osc__lv2-gtk3.o: carla_bridge_osc.cpp
 # ui_lv2-qt4
 
 OBJS_UI_LV2_QT4 = \
-	carla_bridge_ui-lv2__lv2-qt4.o carla_bridge_toolkit-qt4__lv2-qt4.o carla_bridge_osc__lv2-qt4.o \
+	carla_bridge_ui-lv2__lv2-qt4.o carla_bridge_toolkit-qt4__lv2-qt4.o carla_bridge_osc__lv2.o \
 	../carla-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a
 
 carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4)
@@ -149,7 +162,7 @@ carla_bridge_osc__lv2-qt4.o: carla_bridge_osc.cpp
 # ui_lv2-x11
 
 OBJS_UI_LV2_X11 = \
-	carla_bridge_ui-lv2__lv2-x11.o carla_bridge_toolkit-qt4__lv2-x11.o carla_bridge_osc__lv2-x11.o \
+	carla_bridge_ui-lv2__lv2-x11.o carla_bridge_toolkit-qt4__lv2-x11.o carla_bridge_osc__lv2.o \
 	../carla-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a
 
 carla-bridge-lv2-x11: $(OBJS_UI_LV2_X11)
@@ -168,7 +181,7 @@ carla_bridge_osc__lv2-x11.o: carla_bridge_osc.cpp
 # ui_vst-hwnd
 
 OBJS_UI_VST_HWND = \
-	carla_bridge_ui-vst__vst-hwnd.o carla_bridge_toolkit-qt4__vst-hwnd.o carla_bridge_osc__vst-hwnd.o
+	carla_bridge_ui-vst__vst-hwnd.o carla_bridge_toolkit-qt4__vst-hwnd.o carla_bridge_osc__vst.o
 
 carla-bridge-vst-hwnd.exe: $(OBJS_UI_VST_HWND)
 	$(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@ && $(STRIP) $@
@@ -179,14 +192,11 @@ carla_bridge_ui-vst__vst-hwnd.o: carla_bridge_ui-vst.cpp
 carla_bridge_toolkit-qt4__vst-hwnd.o: carla_bridge_toolkit-qt4.cpp
 	$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@
 
-carla_bridge_osc__vst-hwnd.o: carla_bridge_osc.cpp
-	$(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@
-
 # --------------------------------------------------------------
 # ui_vst-x11
 
 OBJS_UI_VST_X11 = \
-	carla_bridge_ui-vst__vst-x11.o carla_bridge_toolkit-qt4__vst-x11.o carla_bridge_osc__vst-x11.o
+	carla_bridge_ui-vst__vst-x11.o carla_bridge_toolkit-qt4__vst-x11.o carla_bridge_osc__vst.o
 
 carla-bridge-vst-x11: $(OBJS_UI_VST_X11)
 	$(CXX) $^ $(LINK_UI_VST_X11_FLAGS) -o $@ && $(STRIP) $@
@@ -197,9 +207,6 @@ carla_bridge_ui-vst__vst-x11.o: carla_bridge_ui-vst.cpp
 carla_bridge_toolkit-qt4__vst-x11.o: carla_bridge_toolkit-qt4.cpp
 	$(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@
 
-carla_bridge_osc__vst-x11.o: carla_bridge_osc.cpp
-	$(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@
-
 # --------------------------------------------------------------
 # posix32
 

c++/carla-bridge/carla_bridge.h → c++/carla-bridge/carla_bridge.hpp

@@ -15,10 +15,10 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#ifndef CARLA_BRIDGE_H
-#define CARLA_BRIDGE_H
+#ifndef CARLA_BRIDGE_HPP
+#define CARLA_BRIDGE_HPP
 
-#include "carla_includes.h"
+#include "carla_defines.hpp"
 
 #define CARLA_BRIDGE_START_NAMESPACE namespace CarlaBridge {
 #define CARLA_BRIDGE_END_NAMESPACE }
@@ -30,4 +30,4 @@ class CarlaToolkit;
 
 CARLA_BRIDGE_END_NAMESPACE
 
-#endif // CARLA_BRIDGE_H
+#endif // CARLA_BRIDGE_HPP

c++/carla-bridge/carla_bridge_client.h → c++/carla-bridge/carla_bridge_client.hpp

@@ -18,13 +18,13 @@
 #ifndef CARLA_BRIDGE_CLIENT_H
 #define CARLA_BRIDGE_CLIENT_H
 
-#include "carla_bridge_osc.h"
-#include "carla_bridge_toolkit.h"
+#include "carla_bridge_osc.hpp"
+#include "carla_bridge_toolkit.hpp"
 
 #ifdef BUILD_BRIDGE_PLUGIN
-#  include "carla_engine.h"
+# include "carla_engine.hpp"
 #else
-#  include "carla_lib_includes.h"
+# include "carla_lib_utils.hpp"
 #endif
 
 #include <cmath>

c++/carla-bridge/carla_bridge_osc.cpp

@@ -15,9 +15,9 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "carla_bridge_osc.h"
-#include "carla_bridge_client.h"
-#include "carla_midi.h"
+#include "carla_bridge_osc.hpp"
+#include "carla_bridge_client.hpp"
+#include "carla_midi.hpp"
 
 #include <QtCore/QString>
 #include <QtCore/QStringList>

c++/carla-bridge/carla_bridge_osc.h → c++/carla-bridge/carla_bridge_osc.hpp

@@ -18,8 +18,8 @@
 #ifndef CARLA_BRIDGE_OSC_H
 #define CARLA_BRIDGE_OSC_H
 
-#include "carla_bridge.h"
-#include "carla_osc_includes.h"
+#include "carla_bridge.hpp"
+#include "carla_osc_utils.hpp"
 
 #define CARLA_BRIDGE_OSC_HANDLE_ARGS const int argc, const lo_arg* const* const argv, const char* const types
 

c++/carla-bridge/carla_bridge_toolkit-gtk2.cpp

@@ -15,10 +15,10 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "carla_bridge_client.h"
+#include "carla_bridge_client.hpp"
 
 #ifdef BRIDGE_LV2_X11
-#  error X11 UI uses Qt4
+# error X11 UI uses Qt4
 #endif
 
 #include <gtk/gtk.h>

c++/carla-bridge/carla_bridge_toolkit-gtk3.cpp

@@ -15,10 +15,10 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "carla_bridge_client.h"
+#include "carla_bridge_client.hpp"
 
 #ifdef BRIDGE_LV2_X11
-#  error X11 UI uses Qt4
+# error X11 UI uses Qt4
 #endif
 
 #include <gtk/gtk.h>

c++/carla-bridge/carla_bridge_toolkit-qt4.cpp

@@ -15,7 +15,7 @@
  * For a full copy of the GNU General Public License see the COPYING file
  */
 
-#include "carla_bridge_client.h"
+#include "carla_bridge_client.hpp"
 
 #include <QtCore/QSettings>
 #include <QtCore/QTimer>

c++/carla-bridge/carla_bridge_toolkit.h → c++/carla-bridge/carla_bridge_toolkit.hpp

@@ -18,7 +18,7 @@
 #ifndef CARLA_BRIDGE_TOOLKIT_H
 #define CARLA_BRIDGE_TOOLKIT_H
 
-#include "carla_bridge.h"
+#include "carla_bridge.hpp"
 
 #include <cstdlib>
 #include <cstring>

c++/carla-bridge/carla_bridge_ui-lv2.cpp

@@ -17,9 +17,9 @@
 
 #ifdef BRIDGE_LV2
 
-#include "carla_bridge_client.h"
-#include "carla_lv2.h"
-#include "carla_midi.h"
+#include "carla_bridge_client.hpp"
+#include "carla_lv2_utils.hpp"
+#include "carla_midi.hpp"
 #include "rtmempool/rtmempool.h"
 
 #include <vector>
@@ -333,7 +333,7 @@ public:
         // -----------------------------------------------------------------
         // get plugin from lv2_rdf (lilv)
 
-        Lv2World.init();
+        lv2World.init();
         rdf_descriptor = lv2_rdf_new(pluginURI);
 
         if (! rdf_descriptor)

c++/carla-bridge/carla_bridge_ui-vst.cpp

@@ -17,15 +17,15 @@
 
 #ifdef BRIDGE_VST
 
-#include "carla_bridge_client.h"
-#include "carla_vst.h"
-#include "carla_midi.h"
+#include "carla_bridge_client.hpp"
+#include "carla_vst_utils.hpp"
+#include "carla_midi.hpp"
 
 #include <QtCore/QTimerEvent>
 #include <QtGui/QDialog>
 
 #ifdef Q_WS_X11
-#include <QtGui/QX11Info>
+# include <QtGui/QX11Info>
 #endif
 
 CARLA_BRIDGE_START_NAMESPACE