From f65ab686a55a77ddfe94d878fd51d457934def19 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sat, 29 Dec 2012 23:34:30 +0000
Subject: [PATCH] Add carla-bridge-native build, much simpler for standalone
 usage

---
 Makefile                  |  1 +
 c++/carla-bridge/Makefile | 56 ++++++++++++++++++++++++++++++++++++---
 data/carla-standalone     |  5 +++-
 3 files changed, 58 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index f3bb508..d3a624e 100644
--- a/Makefile
+++ b/Makefile
@@ -412,6 +412,7 @@ uninstall:
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/claudia-launcher.desktop
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
 	rm -f $(DESTDIR)$(PREFIX)/share/applications/carla-control.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/caitlyn.desktop
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/cadence.png
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/catarina.png
 	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/catia.png
diff --git a/c++/carla-bridge/Makefile b/c++/carla-bridge/Makefile
index 98c2444..3741076 100644
--- a/c++/carla-bridge/Makefile
+++ b/c++/carla-bridge/Makefile
@@ -6,6 +6,9 @@
 
 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
@@ -81,15 +84,15 @@ LINK_UI_VST_X11_FLAGS   = $(LINK_UI_FLAGS) $(QT_UI_LIBS)
 # --------------------------------------------------------------
 
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-all: ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11
+all: native ui_lv2-gtk2 ui_lv2-gtk3 ui_lv2-qt4 ui_lv2-qt5 ui_lv2-x11 ui_vst-x11
 
-ifeq ($(shell pkg-config --exists gtk+-2.0 && echo true),true)
+ifeq ($(HAVE_GTK2),true)
 ui_lv2-gtk2: carla-bridge-lv2-gtk2
 else
 ui_lv2-gtk2:
 endif
 
-ifeq ($(shell pkg-config --exists gtk+-3.0 && echo true),true)
+ifeq ($(HAVE_GTK3),true)
 ui_lv2-gtk3: carla-bridge-lv2-gtk3
 else
 ui_lv2-gtk3:
@@ -115,6 +118,7 @@ endif
 
 # --------------------------------------------------------------
 
+native:  carla-bridge-native
 posix32: carla-bridge-posix32
 posix64: carla-bridge-posix64
 win32:   carla-bridge-win32.exe
@@ -224,6 +228,52 @@ carla-bridge-vst-x11: $(OBJS_UI_VST_X11)
 %__vst-x11.o: %.cpp
 	$(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@
 
+# --------------------------------------------------------------
+# native
+
+NATIVE_BUILD_FLAGS  = $(BUILD_PLUGIN_FLAGS)
+NATIVE_LINK_FLAGS   = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl
+
+ifeq ($(HAVE_SUIL),true)
+NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags suil-0) -DWANT_SUIL
+NATIVE_LINK_FLAGS  += $(shell pkg-config --libs suil-0)
+endif
+
+OBJS_NATIVE  = carla_bridge_plugin__native.o \
+	carla_bridge_client__native.o carla_bridge_osc__native.o \
+	carla_bridge_toolkit__native.o
+
+# carla
+OBJS_NATIVE += \
+	../carla/Shared__native.o
+
+# carla-engine
+OBJS_NATIVE += \
+	../carla-engine/carla_engine__native.o \
+	../carla-engine/carla_engine_osc__native.o \
+	../carla-engine/carla_engine_thread__native.o \
+	../carla-engine/jack__native.o
+
+# carla-plugin
+OBJS_NATIVE += \
+	../carla-plugin/carla_plugin__native.o \
+	../carla-plugin/carla_plugin_thread__native.o \
+	../carla-plugin/ladspa__native.o \
+	../carla-plugin/dssi__native.o \
+	../carla-plugin/lv2__native.o \
+	../carla-plugin/vst__native.o
+
+# libs
+OBJS_NATIVE += \
+	../carla-lilv/carla_lilv.a \
+	../carla-rtmempool/carla_rtmempool.a
+
+carla-bridge-native: $(OBJS_NATIVE)
+	$(CXX) $^ $(NATIVE_LINK_FLAGS) -o $@ && $(STRIP) $@
+
+%__native.o: %.cpp
+	$(CXX) $< $(NATIVE_BUILD_FLAGS) -c -o $@
+
 # --------------------------------------------------------------
 # posix32
 
diff --git a/data/carla-standalone b/data/carla-standalone
index bce6115..d15e781 100755
--- a/data/carla-standalone
+++ b/data/carla-standalone
@@ -11,6 +11,7 @@ if [ "$3"x == ""x ]; then
   echo "usage: $0 [arch] [mode] [filename] [label/uri]
 
 Possible archs:
+  - \"native\"
   - \"posix32\"
   - \"posix64\"
   - \"win32\"
@@ -23,7 +24,9 @@ Possible modes:
   - \"vst\"
 
 Examples:
-  $0 posix64 lv2 \"/usr/lib/lv2/calf/\" \"http://calf.sourceforge.net/plugins/Compressor\"
+  $0 native dssi \"/usr/lib/dssi/hexter.so\" \"hexter\"
+  $0 native lv2 \"/usr/lib/lv2/calf/\" \"http://calf.sourceforge.net/plugins/Compressor\"
+  $0 native vst \"/usr/lib/vst/TAL-NoiseMaker.so\"
 "
   exit
 fi