From 4574adb8957d4c76a00b8b49031e826b78750c2a Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 10 Nov 2012 14:34:16 +0000 Subject: [PATCH] Adjust doxygen docs --- .gitignore | 9 +- Makefile | 10 +- c++/carla-backend/Makefile | 3 +- c++/carla-bridge/Makefile | 2 +- c++/carla-bridge/Makefile.dbg | 422 -------------------------- c++/carla-bridge/carla_bridge.doxygen | 8 +- c++/carla-engine/Makefile | 2 +- c++/carla-engine/carla_engine.doxygen | 8 +- c++/carla-engine/carla_engine.pro | 2 +- c++/carla-engine/plugin.cpp | 6 + c++/carla-native/Makefile | 2 +- c++/carla-native/carla_native.doxygen | 8 +- c++/carla-plugin/Makefile | 2 +- 13 files changed, 35 insertions(+), 449 deletions(-) delete mode 100644 c++/carla-bridge/Makefile.dbg diff --git a/.gitignore b/.gitignore index 968c5ef..45617be 100644 --- a/.gitignore +++ b/.gitignore @@ -38,11 +38,14 @@ carla-discovery-posix64 c++/jackmeter/cadence-jackmeter c++/xycontroller/cadence-xycontroller -c++/carla-backend/doxygen/ -c++/carla-bridge/doxygen/ -c++/carla-native/doxygen/ c++/carla-includes/vst/ +doc/carla-backend/ +doc/carla-bridge/ +doc/carla-engine/ +doc/carla-native/ +doc/carla-plugin/ + *-build-*Debug/ *-build-*Release/ diff --git a/Makefile b/Makefile index 59e1f02..1c12f14 100644 --- a/Makefile +++ b/Makefile @@ -211,11 +211,11 @@ debug: $(MAKE) DEBUG=true doxygen: - $(MAKE) doc -C c++/carla-backend - $(MAKE) doc -C c++/carla-bridge - $(MAKE) doc -C c++/carla-engine - $(MAKE) doc -C c++/carla-native -# $(MAKE) doc -C c++/carla-plugin + $(MAKE) doxygen -C c++/carla-backend + $(MAKE) doxygen -C c++/carla-bridge + $(MAKE) doxygen -C c++/carla-engine + $(MAKE) doxygen -C c++/carla-native + $(MAKE) doxygen -C c++/carla-plugin # ------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/c++/carla-backend/Makefile b/c++/carla-backend/Makefile index 4839bfa..be32b5a 100644 --- a/c++/carla-backend/Makefile +++ b/c++/carla-backend/Makefile @@ -83,11 +83,10 @@ endif all: carla_backend.so -doc: carla_backend.doxygen +doxygen: carla_backend.doxygen doxygen $< carla_backend.so: $(OBJS) - echo $(LINK_FLAGS) $(CXX) $^ $(LINK_FLAGS) -o $@ && $(STRIP) $@ # -------------------------------------------------------------- diff --git a/c++/carla-bridge/Makefile b/c++/carla-bridge/Makefile index 7377d5c..799043b 100644 --- a/c++/carla-bridge/Makefile +++ b/c++/carla-bridge/Makefile @@ -422,7 +422,7 @@ vst__win64.o: ../carla-backend/vst.cpp # -------------------------------------------------------------- -doc: carla_bridge.doxygen +doxygen: carla_bridge.doxygen doxygen $< clean: diff --git a/c++/carla-bridge/Makefile.dbg b/c++/carla-bridge/Makefile.dbg deleted file mode 100644 index 1b15502..0000000 --- a/c++/carla-bridge/Makefile.dbg +++ /dev/null @@ -1,422 +0,0 @@ -#!/usr/bin/make -f -# Makefile for carla-bridges # -# ---------------------------------------- # -# Created by falkTX -# - -CXX ?= g++ - -BASE_FLAGS = -O0 -g - -BUILD_FLAGS = $(BASE_FLAGS) -std=c++0x $(CXXFLAGS) -BUILD_FLAGS += -I. -I../carla-includes $(shell pkg-config --cflags liblo QtCore) -BUILD_FLAGS += -DBUILD_BRIDGE -DDEBUG - -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) - -# -------------------------------------------------------------- - -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) - -POSIX_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) -POSIX_32BIT_FLAGS = $(32BIT_FLAGS) -L/usr/lib32 -L/usr/lib/i386-linux-gnu -POSIX_64BIT_FLAGS = $(64BIT_FLAGS) -L/usr/lib64 -L/usr/lib/x86_64-linux-gnu -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 - -# -------------------------------------------------------------- - -BUILD_UI_FLAGS = $(BUILD_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) -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) -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) -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) -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) -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) -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 ($(shell pkg-config --exists gtk+-2.0 && echo true),true) -ui_lv2-gtk2: carla-bridge-lv2-gtk2 -else -ui_lv2-gtk2: -endif - -ifeq ($(shell pkg-config --exists gtk+-3.0 && echo true),true) -ui_lv2-gtk3: carla-bridge-lv2-gtk3 -else -ui_lv2-gtk3: -endif - -ui_lv2-qt4: carla-bridge-lv2-qt4 -ui_lv2-x11: carla-bridge-lv2-x11 -ui_vst-hwnd: carla-bridge-vst-hwnd.exe -ui_vst-x11: carla-bridge-vst-x11 - -# -------------------------------------------------------------- - -posix32: carla-bridge-posix32 -posix64: carla-bridge-posix64 -win32: carla-bridge-win32.exe -win64: carla-bridge-win64.exe - -# -------------------------------------------------------------- -# 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-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a - -carla-bridge-lv2-gtk2: $(OBJS_UI_LV2_GTK2) - $(CXX) $^ $(LINK_UI_LV2_GTK2_FLAGS) -o $@ - -carla_bridge_ui-lv2__lv2-gtk2.o: carla_bridge_ui-lv2.cpp - $(CXX) $< $(BUILD_UI_LV2_GTK2_FLAGS) -c -o $@ - -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-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a - -carla-bridge-lv2-gtk3: $(OBJS_UI_LV2_GTK3) - $(CXX) $^ $(LINK_UI_LV2_GTK3_FLAGS) -o $@ - -carla_bridge_ui-lv2__lv2-gtk3.o: carla_bridge_ui-lv2.cpp - $(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@ - -carla_bridge_toolkit-gtk3__lv2-gtk3.o: carla_bridge_toolkit-gtk3.cpp - $(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@ - -carla_bridge_osc__lv2-gtk3.o: carla_bridge_osc.cpp - $(CXX) $< $(BUILD_UI_LV2_GTK3_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# 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-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a - -carla-bridge-lv2-qt4: $(OBJS_UI_LV2_QT4) - $(CXX) $^ $(LINK_UI_LV2_QT4_FLAGS) -o $@ - -carla_bridge_ui-lv2__lv2-qt4.o: carla_bridge_ui-lv2.cpp - $(CXX) $< $(BUILD_UI_LV2_QT4_FLAGS) -c -o $@ - -carla_bridge_toolkit-qt4__lv2-qt4.o: carla_bridge_toolkit-qt4.cpp - $(CXX) $< $(BUILD_UI_LV2_QT4_FLAGS) -c -o $@ - -carla_bridge_osc__lv2-qt4.o: carla_bridge_osc.cpp - $(CXX) $< $(BUILD_UI_LV2_QT4_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# 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-lilv/carla_lilv.a ../carla-rtmempool/carla_rtmempool.a - -carla-bridge-lv2-x11: $(OBJS_UI_LV2_X11) - $(CXX) $^ $(LINK_UI_LV2_X11_FLAGS) -o $@ - -carla_bridge_ui-lv2__lv2-x11.o: carla_bridge_ui-lv2.cpp - $(CXX) $< $(BUILD_UI_LV2_X11_FLAGS) -c -o $@ - -carla_bridge_toolkit-qt4__lv2-x11.o: carla_bridge_toolkit-qt4.cpp - $(CXX) $< $(BUILD_UI_LV2_X11_FLAGS) -c -o $@ - -carla_bridge_osc__lv2-x11.o: carla_bridge_osc.cpp - $(CXX) $< $(BUILD_UI_LV2_X11_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# 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-vst-hwnd.exe: $(OBJS_UI_VST_HWND) - $(CXX) $^ $(LINK_UI_VST_HWND_FLAGS) -o $@ - -carla_bridge_ui-vst__vst-hwnd.o: carla_bridge_ui-vst.cpp - $(CXX) $< $(BUILD_UI_VST_HWND_FLAGS) -c -o $@ - -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-vst-x11: $(OBJS_UI_VST_X11) - $(CXX) $^ $(LINK_UI_VST_X11_FLAGS) -o $@ - -carla_bridge_ui-vst__vst-x11.o: carla_bridge_ui-vst.cpp - $(CXX) $< $(BUILD_UI_VST_X11_FLAGS) -c -o $@ - -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 - -OBJS_POSIX32 = \ - carla_bridge_plugin__posix32.o carla_bridge_osc__posix32.o carla_jackbridge__posix32.o \ - carla_engine__posix32.o carla_engine_jack__posix32.o carla_shared__posix32.o carla_threads__posix32.o \ - ladspa__posix32.o dssi__posix32.o lv2__posix32.o vst__posix32.o \ - ../carla-lilv/carla_lilv_posix32.a ../carla-rtmempool/carla_rtmempool_posix32.a - -carla-bridge-posix32: $(OBJS_POSIX32) - $(CXX) $^ $(POSIX_LINK_FLAGS) $(POSIX_32BIT_FLAGS) -o $@ - -carla_bridge_plugin__posix32.o: carla_bridge_plugin.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_bridge_osc__posix32.o: carla_bridge_osc.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_jackbridge__posix32.o: ../carla-jackbridge/carla_jackbridge.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_engine__posix32.o: ../carla-backend/carla_engine.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_engine_jack__posix32.o: ../carla-backend/carla_engine_jack.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_shared__posix32.o: ../carla-backend/carla_shared.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -carla_threads__posix32.o: ../carla-backend/carla_threads.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -ladspa__posix32.o: ../carla-backend/ladspa.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -dssi__posix32.o: ../carla-backend/dssi.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -lv2__posix32.o: ../carla-backend/lv2.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -vst__posix32.o: ../carla-backend/vst.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_32BIT_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# posix64 - -OBJS_POSIX64 = \ - carla_bridge_plugin__posix64.o carla_bridge_osc__posix64.o carla_jackbridge__posix64.o \ - carla_engine__posix64.o carla_engine_jack__posix64.o carla_shared__posix64.o carla_threads__posix64.o \ - ladspa__posix64.o dssi__posix64.o lv2__posix64.o vst__posix64.o \ - ../carla-lilv/carla_lilv_posix64.a ../carla-rtmempool/carla_rtmempool_posix64.a - -carla-bridge-posix64: $(OBJS_POSIX64) - $(CXX) $^ $(POSIX_LINK_FLAGS) $(POSIX_64BIT_FLAGS) -o $@ - -carla_bridge_plugin__posix64.o: carla_bridge_plugin.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_bridge_osc__posix64.o: carla_bridge_osc.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_jackbridge__posix64.o: ../carla-jackbridge/carla_jackbridge.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_engine__posix64.o: ../carla-backend/carla_engine.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_engine_jack__posix64.o: ../carla-backend/carla_engine_jack.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_shared__posix64.o: ../carla-backend/carla_shared.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -carla_threads__posix64.o: ../carla-backend/carla_threads.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -ladspa__posix64.o: ../carla-backend/ladspa.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -dssi__posix64.o: ../carla-backend/dssi.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -lv2__posix64.o: ../carla-backend/lv2.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -vst__posix64.o: ../carla-backend/vst.cpp - $(CXX) $< $(POSIX_BUILD_FLAGS) $(POSIX_64BIT_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# win32 - -OBJS_WIN32 = \ - carla_bridge_plugin__win32.o carla_bridge_osc__win32.o \ - carla_engine__win32.o carla_engine_jack__win32.o carla_shared__win32.o carla_threads__win32.o \ - ladspa__win32.o dssi__win32.o lv2__win32.o vst__win32.o \ - ../carla-lilv/carla_lilv_win32.a ../carla-rtmempool/carla_rtmempool_win32.a - -carla-bridge-win32.exe: $(OBJS_WIN32) ../carla-jackbridge/libcarla-jackbridge-win32.dll - $(CXX) $(OBJS_WIN32) $(WIN_LINK_FLAGS) $(WIN_32BIT_FLAGS) -lcarla-jackbridge-win32 -o $@ - -carla_bridge_plugin__win32.o: carla_bridge_plugin.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -carla_bridge_osc__win32.o: carla_bridge_osc.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -carla_engine__win32.o: ../carla-backend/carla_engine.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -carla_engine_jack__win32.o: ../carla-backend/carla_engine_jack.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -carla_shared__win32.o: ../carla-backend/carla_shared.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -carla_threads__win32.o: ../carla-backend/carla_threads.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -ladspa__win32.o: ../carla-backend/ladspa.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -dssi__win32.o: ../carla-backend/dssi.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -lv2__win32.o: ../carla-backend/lv2.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -vst__win32.o: ../carla-backend/vst.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_32BIT_FLAGS) -c -o $@ - -# -------------------------------------------------------------- -# win64 - -OBJS_WIN64 = \ - carla_bridge_plugin__win64.o carla_bridge_osc__win64.o \ - carla_engine__win64.o carla_engine_jack__win64.o carla_shared__win64.o carla_threads__win64.o \ - ladspa__win64.o dssi__win64.o lv2__win64.o vst__win64.o \ - ../carla-lilv/carla_lilv_win64.a ../carla-rtmempool/carla_rtmempool_win64.a - -carla-bridge-win64.exe: $(OBJS_WIN64) ../carla-jackbridge/libcarla-jackbridge-win64.dll - $(CXX) $(OBJS_WIN64) $(WIN_LINK_FLAGS) $(WIN_64BIT_FLAGS) -lcarla-jackbridge-win64 -o $@ - -carla_bridge_plugin__win64.o: carla_bridge_plugin.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -carla_bridge_osc__win64.o: carla_bridge_osc.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -carla_engine__win64.o: ../carla-backend/carla_engine.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -carla_engine_jack__win64.o: ../carla-backend/carla_engine_jack.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -carla_shared__win64.o: ../carla-backend/carla_shared.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -carla_threads__win64.o: ../carla-backend/carla_threads.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -ladspa__win64.o: ../carla-backend/ladspa.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -dssi__win64.o: ../carla-backend/dssi.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -lv2__win64.o: ../carla-backend/lv2.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -vst__win64.o: ../carla-backend/vst.cpp - $(CXX) $< $(WIN_BUILD_FLAGS) $(WIN_64BIT_FLAGS) -c -o $@ - -# -------------------------------------------------------------- - -../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 - -../carla-jackbridge/libcarla-jackbridge-win32.dll: - $(MAKE) -C ../carla-jackbridge win32 - -../carla-jackbridge/libcarla-jackbridge-win64.dll: - $(MAKE) -C ../carla-jackbridge win64 - -# -------------------------------------------------------------- - -doc: carla_bridge.doxygen - doxygen $< - -clean: - rm -f *.o *.so *.exe - rm -f carla-bridge-lv2-gtk2 carla-bridge-lv2-gtk3 carla-bridge-lv2-qt4 carla-bridge-lv2-x11 carla-bridge-vst-x11 - rm -f carla-bridge-posix32 carla-bridge-posix64 diff --git a/c++/carla-bridge/carla_bridge.doxygen b/c++/carla-bridge/carla_bridge.doxygen index 8529257..4dd7dc1 100644 --- a/c++/carla-bridge/carla_bridge.doxygen +++ b/c++/carla-bridge/carla_bridge.doxygen @@ -8,7 +8,7 @@ PROJECT_NAME = "Carla Bridge" PROJECT_NUMBER = PROJECT_BRIEF = PROJECT_LOGO = -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = ../../doc/carla-bridge CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -99,7 +99,7 @@ INPUT = INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO -EXCLUDE = +EXCLUDE = carla_bridge_osc.hpp carla_bridge_osc.cpp carla_bridge_plugin.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = @@ -132,7 +132,7 @@ IGNORE_PREFIX = # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = html +HTML_OUTPUT = . HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = @@ -241,7 +241,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = DOXYGEN BUILD_BRIDGE BUILD_BRIDGE_PLUGIN BUILD_BRIDGE_UI BRIDGE_LV2 BRIDGE_VST LV2_GTK2 BRIDGE_LV2_GTK3 BRIDGE_LV2_QT4 BRIDGE_LV2_X11 BRIDGE_VST_HWND BRIDGE_VST_X11 +PREDEFINED = DOXYGEN BUILD_BRIDGE BUILD_BRIDGE_PLUGIN BUILD_BRIDGE_UI BRIDGE_LV2 BRIDGE_LV2_GTK2 BRIDGE_LV2_GTK3 BRIDGE_LV2_QT4 BRIDGE_LV2_X11 BRIDGE_VST BRIDGE_VST_HWND BRIDGE_VST_X11 EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- diff --git a/c++/carla-engine/Makefile b/c++/carla-engine/Makefile index 6781854..77ec063 100644 --- a/c++/carla-engine/Makefile +++ b/c++/carla-engine/Makefile @@ -66,7 +66,7 @@ endif all: carla_engine.a -doc: carla_engine.doxygen +doxygen: carla_engine.doxygen doxygen $< carla_engine.a: $(OBJS) diff --git a/c++/carla-engine/carla_engine.doxygen b/c++/carla-engine/carla_engine.doxygen index 6df3c55..533a401 100644 --- a/c++/carla-engine/carla_engine.doxygen +++ b/c++/carla-engine/carla_engine.doxygen @@ -8,7 +8,7 @@ PROJECT_NAME = "Carla Engine" PROJECT_NUMBER = PROJECT_BRIEF = PROJECT_LOGO = -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = ../../doc/carla-engine CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -99,7 +99,7 @@ INPUT = INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO -EXCLUDE = +EXCLUDE = carla_engine.cpp carla_engine_osc.hpp carla_engine_osc.cpp carla_engine_thread.hpp carla_engine_thread.cpp DistrhoPluginInfo.h EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = @@ -132,7 +132,7 @@ IGNORE_PREFIX = # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = html +HTML_OUTPUT = . HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = @@ -241,7 +241,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = DOXYGEN CARLA_ENGINE_JACK CARLA_ENGINE_RTAUDIO +PREDEFINED = DOXYGEN CARLA_ENGINE_JACK CARLA_ENGINE_RTAUDIO CARLA_ENGINE_PLUGIN EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- diff --git a/c++/carla-engine/carla_engine.pro b/c++/carla-engine/carla_engine.pro index 9126c3c..7cdfcfd 100644 --- a/c++/carla-engine/carla_engine.pro +++ b/c++/carla-engine/carla_engine.pro @@ -11,6 +11,7 @@ DEFINES += QTCREATOR_TEST DEFINES += CARLA_ENGINE_JACK DEFINES += CARLA_ENGINE_RTAUDIO HAVE_GETTIMEOFDAY _FORTIFY_SOURCE=2 +DEFINES += CARLA_ENGINE_PLUGIN DISTRHO_PLUGIN_TARGET_DSSI DEFINES += __LINUX_ALSA__ __LINUX_ALSASEQ__ __LINUX_PULSE__ DEFINES += __RTAUDIO_DEBUG__ __RTMIDI_DEBUG__ DEFINES += WANT_LV2 @@ -50,7 +51,6 @@ SOURCES += rtaudio-4.0.11/RtAudio.cpp SOURCES += rtmidi-2.0.1/RtMidi.cpp # Plugin -DEFINES += DISTRHO_PLUGIN_TARGET_DSSI INCLUDEPATH += distrho-plugin-toolkit QMAKE_CXXFLAGS *= -std=c++0x diff --git a/c++/carla-engine/plugin.cpp b/c++/carla-engine/plugin.cpp index 9b2633d..0e29223 100644 --- a/c++/carla-engine/plugin.cpp +++ b/c++/carla-engine/plugin.cpp @@ -15,6 +15,8 @@ * For a full copy of the GNU General Public License see the COPYING file */ +#ifdef CARLA_ENGINE_PLUGIN + #include "carla_engine.hpp" #include "carla_plugin.hpp" @@ -530,4 +532,8 @@ Plugin* createPlugin() END_NAMESPACE_DISTRHO +// ------------------------------------------------- + #include "DistrhoPluginMain.cpp" + +#endif // CARLA_ENGINE_PLUGIN diff --git a/c++/carla-native/Makefile b/c++/carla-native/Makefile index 301198f..89d2e32 100644 --- a/c++/carla-native/Makefile +++ b/c++/carla-native/Makefile @@ -39,7 +39,7 @@ endif all: carla_native.a -doc: carla_native.doxygen +doxygen: carla_native.doxygen doxygen $< carla_native.a: $(OBJS) diff --git a/c++/carla-native/carla_native.doxygen b/c++/carla-native/carla_native.doxygen index 1d4b9fb..3537a69 100644 --- a/c++/carla-native/carla_native.doxygen +++ b/c++/carla-native/carla_native.doxygen @@ -8,7 +8,7 @@ PROJECT_NAME = "Carla Native" PROJECT_NUMBER = PROJECT_BRIEF = PROJECT_LOGO = -OUTPUT_DIRECTORY = doxygen +OUTPUT_DIRECTORY = ../../doc/carla-native CREATE_SUBDIRS = NO OUTPUT_LANGUAGE = English BRIEF_MEMBER_DESC = YES @@ -99,7 +99,7 @@ INPUT = INPUT_ENCODING = UTF-8 FILE_PATTERNS = RECURSIVE = NO -EXCLUDE = +EXCLUDE = bypass.c midi-split.cpp zynaddsubfx.cpp zynaddsubfx-src.cpp EXCLUDE_SYMLINKS = NO EXCLUDE_PATTERNS = EXCLUDE_SYMBOLS = @@ -132,7 +132,7 @@ IGNORE_PREFIX = # configuration options related to the HTML output #--------------------------------------------------------------------------- GENERATE_HTML = YES -HTML_OUTPUT = html +HTML_OUTPUT = . HTML_FILE_EXTENSION = .html HTML_HEADER = HTML_FOOTER = @@ -241,7 +241,7 @@ EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES INCLUDE_PATH = INCLUDE_FILE_PATTERNS = -PREDEFINED = DOXYGEN +PREDEFINED = DOXYGEN WANT_ZYNADDSUBFX EXPAND_AS_DEFINED = SKIP_FUNCTION_MACROS = YES #--------------------------------------------------------------------------- diff --git a/c++/carla-plugin/Makefile b/c++/carla-plugin/Makefile index 20e1062..1235afb 100644 --- a/c++/carla-plugin/Makefile +++ b/c++/carla-plugin/Makefile @@ -59,7 +59,7 @@ OBJS = \ all: carla_plugin.a -doc: carla_plugin.doxygen +doxygen: carla_plugin.doxygen doxygen $< carla_plugin.a: $(OBJS)