diff --git a/source/backend/native/Makefile b/source/backend/native/Makefile index ce65ea9b7..63bbe7401 100644 --- a/source/backend/native/Makefile +++ b/source/backend/native/Makefile @@ -35,11 +35,11 @@ OBJS = \ nekofilter.c.o # DISTRHO plugins -OBJS += \ - distrho-3bandeq.cpp.o \ - distrho-3bandsplitter.cpp.o \ - distrho-pingpongpan.cpp.o \ - distrho-notes.cpp.o +# OBJS += \ +# distrho-3bandeq.cpp.o \ +# distrho-3bandsplitter.cpp.o \ +# distrho-pingpongpan.cpp.o \ +# distrho-notes.cpp.o # AudioFile ifeq ($(HAVE_AF_DEPS),true) diff --git a/source/backend/plugin/NativePlugin.cpp b/source/backend/plugin/NativePlugin.cpp index a2415dddd..db61f5c89 100644 --- a/source/backend/plugin/NativePlugin.cpp +++ b/source/backend/plugin/NativePlugin.cpp @@ -33,11 +33,13 @@ void carla_register_all_plugins() carla_register_native_plugin_midiTranspose(); carla_register_native_plugin_nekofilter(); +#ifndef BUILD_BRIDGE // DISTRHO plugins carla_register_native_plugin_3BandEQ(); carla_register_native_plugin_3BandSplitter(); carla_register_native_plugin_PingPongPan(); carla_register_native_plugin_Notes(); +#endif #ifdef WANT_AUDIOFILE // AudioFile @@ -1845,22 +1847,30 @@ protected: const char* handleUiOpenFile(const bool isDir, const char* const title, const char* const filter) { +#ifdef BUILD_BRIDGE + return nullptr; +#else static CarlaString retStr; QFileDialog::Options options(isDir ? QFileDialog::ShowDirsOnly : 0x0); retStr = QFileDialog::getOpenFileName(nullptr, title, "", filter, nullptr, options).toUtf8().constData(); return retStr.isNotEmpty() ? (const char*)retStr : nullptr; +#endif } const char* handleUiSaveFile(const bool isDir, const char* const title, const char* const filter) { +#ifdef BUILD_BRIDGE + return nullptr; +#else static CarlaString retStr; QFileDialog::Options options(isDir ? QFileDialog::ShowDirsOnly : 0x0); retStr = QFileDialog::getSaveFileName(nullptr, title, "", filter, nullptr, options).toUtf8().constData(); return (const char*)retStr; +#endif } public: @@ -1955,9 +1965,7 @@ public: public: ScopedInitializer() { -#ifndef BUILD_BRIDGE carla_register_all_plugins(); -#endif } ~ScopedInitializer() diff --git a/source/bridges/Makefile b/source/bridges/Makefile index 168393b28..2db6a9ce6 100644 --- a/source/bridges/Makefile +++ b/source/bridges/Makefile @@ -41,9 +41,17 @@ BUILD_PLUGIN_FLAGS += $(shell pkg-config --cflags gl) LINK_PLUGIN_FLAGS = $(LINK_FLAGS) LINK_PLUGIN_FLAGS += $(shell pkg-config --libs gl) -NATIVE_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack) +NATIVE_BUILD_FLAGS = $(BUILD_PLUGIN_FLAGS) $(shell pkg-config --cflags jack) -DWANT_NATIVE NATIVE_LINK_FLAGS = $(LINK_PLUGIN_FLAGS) $(shell pkg-config --libs jack) -ldl +ifeq ($(HAVE_AF_DEPS),true) +NATIVE_LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat sndfile) +endif + +ifeq ($(HAVE_ZYN_DEPS),true) +NATIVE_LINK_FLAGS += $(shell pkg-config --libs fftw3 mxml) +endif + ifeq ($(HAVE_SUIL),true) NATIVE_BUILD_FLAGS += $(shell pkg-config --cflags suil-0) -DWANT_SUIL NATIVE_LINK_FLAGS += $(shell pkg-config --libs suil-0) @@ -271,6 +279,7 @@ OBJS_NATIVE += \ # libs OBJS_NATIVE += \ + ../backend/libcarla_native.a \ ../libs/dgl.a \ ../libs/lilv.a \ ../libs/rtmempool.a @@ -451,6 +460,9 @@ carla-bridge-win64.exe: $(OBJS_WIN64) ../libs/jackbridge-win64.dll # -------------------------------------------------------------- +../backend/libcarla_native.a: + $(MAKE) -C ../backend/native + ../libs/%: $(MAKE) -C ../libs $*