From 08683468ff04a55c0913881851c6a8b72932e037 Mon Sep 17 00:00:00 2001 From: FilipeCSnuk Date: Tue, 4 Sep 2018 09:32:10 +0200 Subject: [PATCH] Fix linking of carla-bridge against all internal plugins --- source/bridges-plugin/Makefile | 10 +++++----- source/native-plugins/external | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/source/bridges-plugin/Makefile b/source/bridges-plugin/Makefile index a544ef066..ae6e004a4 100644 --- a/source/bridges-plugin/Makefile +++ b/source/bridges-plugin/Makefile @@ -67,16 +67,16 @@ LINK_FLAGS += $(X11_LIBS) # ---------------------------------------------------------------------------------------------------------------------- -NATIVE_BUILD_FLAGS = $(NATIVE_PLUGINS_FLAGS) $(LIBLO_FLAGS) -# NATIVE_LINK_FLAGS = $(LIBLO_LIBS) +NATIVE_BUILD_FLAGS = $(NATIVE_PLUGINS_FLAGS) +NATIVE_LINK_FLAGS = $(NATIVE_PLUGINS_LIBS) + +NATIVE_BUILD_FLAGS += $(LIBLO_FLAGS) +NATIVE_LINK_FLAGS += $(LIBLO_LIBS) NATIVE_BUILD_FLAGS += $(FLUIDSYNTH_FLAGS) NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) -NATIVE_LINK_FLAGS += $(DGL_LIBS) -NATIVE_LINK_FLAGS += $(FFMPEG_LIBS) NATIVE_LINK_FLAGS += $(MAGIC_LIBS) -NATIVE_LINK_FLAGS += $(SNDFILE_LIBS) LIBS_native += $(MODULEDIR)/audio_decoder.a LIBS_native += $(MODULEDIR)/native-plugins.all.a diff --git a/source/native-plugins/external b/source/native-plugins/external index 5fccac046..69b2aa7d2 160000 --- a/source/native-plugins/external +++ b/source/native-plugins/external @@ -1 +1 @@ -Subproject commit 5fccac046b09bba67900f675e0aea18ce3b09775 +Subproject commit 69b2aa7d2e9bad2ba3440725e9a27c72d383ed01