diff -up carla/source/backend/Makefile.systemlibs carla/source/backend/Makefile --- carla/source/backend/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 +++ carla/source/backend/Makefile 2018-11-12 12:09:41.077718615 +0100 @@ -56,6 +56,9 @@ STANDALONE_LINK_FLAGS += $(MAGIC_LIBS) STANDALONE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) STANDALONE_LINK_FLAGS += $(X11_LIBS) +STANDALONE_LINK_FLAGS += $(FLAC_LIBS) +STANDALONE_LINK_FLAGS += $(VORBIS_LIBS) + # ---------------------------------------------------------------------------------------------------------------------------- all: $(TARGETS) diff -up carla/source/backend/utils/Makefile.systemlibs carla/source/backend/utils/Makefile --- carla/source/backend/utils/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 +++ carla/source/backend/utils/Makefile 2018-11-12 12:11:43.501736201 +0100 @@ -25,6 +25,8 @@ LIBS += $(MODULEDIR)/water.files.a LINK_FLAGS += $(LILV_LIBS) LINK_FLAGS += $(WATER_LIBS) +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) ifeq ($(HAVE_X11),true) LINK_FLAGS += $(X11_LIBS) diff -up carla/source/bridges-plugin/Makefile.systemlibs carla/source/bridges-plugin/Makefile --- carla/source/bridges-plugin/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 +++ carla/source/bridges-plugin/Makefile 2018-11-12 12:16:05.041847461 +0100 @@ -78,6 +78,11 @@ NATIVE_LINK_FLAGS += $(FLUIDSYNTH_LIBS) NATIVE_LINK_FLAGS += $(MAGIC_LIBS) +NATIVE_BUILD_FLAGS += $(FLAC_FLAGS) +NATIVE_LINK_FLAGS += $(FLAC_LIBS) +NATIVE_BUILD_FLAGS += $(VORBIS_FLAGS) +NATIVE_LINK_FLAGS += $(VORBIS_LIBS) + LIBS_native += $(MODULEDIR)/audio_decoder.a LIBS_native += $(MODULEDIR)/native-plugins.a LIBS_native += $(MODULEDIR)/sfzero.a diff -up carla/source/bridges-ui/Makefile.systemlibs carla/source/bridges-ui/Makefile --- carla/source/bridges-ui/Makefile.systemlibs 2018-08-04 16:35:52.000000000 +0200 +++ carla/source/bridges-ui/Makefile 2018-11-12 12:21:34.637973676 +0100 @@ -37,10 +37,10 @@ BUILD_QT4_FLAGS = $(BUILD_CXX_FLAGS) LINK_QT4_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs QtCore QtGui) $(LIBDL_LIBS) BUILD_QT5_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_QT5 $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets) -I$(OBJDIR) -I$(CWD)/theme -LINK_QT5_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) $(LIBDL_LIBS) +LINK_QT5_FLAGS = $(LINK_FLAGS) $(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_X11_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_X11 $(X11_FLAGS) -LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) +LINK_X11_FLAGS = $(LINK_FLAGS) $(X11_LIBS) $(LIBDL_LIBS) $(FLAC_LIBS) $(VORBIS_LIBS) BUILD_COCOA_FLAGS = $(BUILD_CXX_FLAGS) -DBRIDGE_COCOA -ObjC++ LINK_COCOA_FLAGS = $(LINK_FLAGS) -framework Cocoa $(LIBDL_LIBS) @@ -50,8 +50,11 @@ LINK_WINDOWS_FLAGS = $(LINK_FLAGS) -sta ifeq ($(HAVE_X11),true) LINK_GTK2_FLAGS += -lX11 +LINK_GTK2_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS) LINK_GTK3_FLAGS += -lX11 +LINK_GTK3_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS) LINK_QT4_FLAGS += -lX11 +LINK_QT4_FLAGS += $(FLAC_LIBS) $(VORBIS_LIBS) endif # --------------------------------------------------------------------------------------------------------------------- diff -up carla/source/Makefile.mk.systemlibs carla/source/Makefile.mk --- carla/source/Makefile.mk.systemlibs 2018-11-08 20:25:26.000000000 +0100 +++ carla/source/Makefile.mk 2018-11-12 12:03:16.933663447 +0100 @@ -413,6 +413,14 @@ FLUIDSYNTH_FLAGS = $(shell pkg-config $( FLUIDSYNTH_LIBS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs fluidsynth) endif +FLAC_FLAGS = $(shell pkg-config --cflags flac) +FLAC_LIBS = $(shell pkg-config --libs flac) +BASE_FLAGS += $(FLAC_FLAGS) + +VORBIS_FLAGS = $(shell pkg-config --cflags vorbis vorbisfile vorbisenc ogg) +VORBIS_LIBS = $(shell pkg-config --libs vorbis vorbisfile vorbisenc ogg) +BASE_FLAGS += $(VORBIS_FLAGS) + ifeq ($(HAVE_SNDFILE),true) SNDFILE_FLAGS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --cflags sndfile) SNDFILE_LIBS = $(shell pkg-config $(PKG_CONFIG_FLAGS) --libs sndfile) diff -up carla/source/plugin/Makefile.systemlibs carla/source/plugin/Makefile --- carla/source/plugin/Makefile.systemlibs 2018-11-08 20:25:26.000000000 +0100 +++ carla/source/plugin/Makefile 2018-11-12 12:24:06.390012077 +0100 @@ -73,6 +73,9 @@ LINK_FLAGS += $(LIBLO_LIBS) LINK_FLAGS += $(MAGIC_LIBS) LINK_FLAGS += $(X11_LIBS) +LINK_FLAGS += $(FLAC_LIBS) +LINK_FLAGS += $(VORBIS_LIBS) + ifeq ($(MACOS),true) SYMBOLS_NATIVE = -Wl,-exported_symbol,_carla_get_native_rack_plugin SYMBOLS_NATIVE += -Wl,-exported_symbol,_carla_get_native_patchbay_plugin
