Fix build

source/backend/standalone/Makefile

@@ -81,22 +81,10 @@ endif
 STATIC_LIBS += ../../modules/native-plugins.a
 
 ifeq ($(HAVE_AF_DEPS),true)
-LINK_FLAGS  += $(shell pkg-config --libs sndfile)
-ifeq ($(HAVE_FFMPEG),true)
-LINK_FLAGS  += $(shell pkg-config --libs libavcodec libavformat libavutil)
-endif
-endif
-
-ifeq ($(HAVE_MF_DEPS),true)
-LINK_FLAGS  += $(shell pkg-config --libs smf)
+STATIC_LIBS += ../../modules/audio_decoder.a
 endif
 
-ifeq ($(HAVE_ZYN_DEPS),true)
-LINK_FLAGS  += $(shell pkg-config --libs fftw3 mxml zlib)
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-LINK_FLAGS  += $(shell pkg-config --libs ntk_images ntk)
-endif
-endif
+LINK_FLAGS  += $(NATIVE_PLUGINS_LIBS)
 
 # ----------------------------------------------------------------------------------------------------------------------------
 

source/bridges/Makefile

@@ -98,26 +98,21 @@ endif
 
 ifeq ($(HAVE_AF_DEPS),true)
 NATIVE_BUILD_FLAGS += -DWANT_AUDIOFILE
-NATIVE_LINK_FLAGS  += $(shell pkg-config --libs sndfile)
-ifeq ($(HAVE_FFMPEG),true)
-NATIVE_LINK_FLAGS  += $(shell pkg-config --libs libavcodec libavformat libavutil)
-endif
 endif
 
 ifeq ($(HAVE_MF_DEPS),true)
 NATIVE_BUILD_FLAGS += -DWANT_MIDIFILE
-NATIVE_LINK_FLAGS  += $(shell pkg-config --libs smf)
 endif
 
 ifeq ($(HAVE_ZYN_DEPS),true)
 NATIVE_BUILD_FLAGS += -DWANT_ZYNADDSUBFX
-NATIVE_LINK_FLAGS  += $(shell pkg-config --libs fftw3 mxml zlib)
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
 NATIVE_LINK_FLAGS  += -DWANT_ZYNADDSUBFX_UI
-NATIVE_LINK_FLAGS  += $(shell pkg-config --libs ntk_images ntk)
 endif
 endif
 
+NATIVE_LINK_FLAGS  += $(NATIVE_PLUGINS_LIBS)
+
 # --------------------------------------------------------------
 
 TARGETS = native
@@ -519,6 +514,11 @@ LIBS_NATIVE += \
 	../modules/juce_gui_extra.a
 endif
 
+ifeq ($(HAVE_AF_DEPS),true)
+LIBS_NATIVE += \
+	../modules/audio_decoder.a
+endif
+
 ifeq ($(CARLA_PLUGIN_SUPPORT),true)
 LIBS_NATIVE += \
 	../modules/lilv.a

source/modules/Makefile

@@ -8,6 +8,14 @@ all:
 
 # --------------------------------------------------------------
 
+audio_decoder:
+	$(MAKE) -C audio_decoder
+
+audio_decoder_%:
+	$(MAKE) -C audio_decoder $*
+
+# --------------------------------------------------------------
+
 dgl:
 	$(MAKE) -C dgl
 
@@ -218,7 +226,7 @@ clean:
 # --------------------------------------------------------------
 
 .PHONY: \
-	dgl jackbridge lilv native-plugins rtaudio rtmidi rtmempool stk theme \
+	audio_decoder dgl jackbridge lilv native-plugins rtaudio rtmidi rtmempool stk theme \
 	juce_audio_basics juce_audio_devices juce_audio_formats juce_audio_processors juce_core juce_data_structures juce_events juce_graphics juce_gui_basics juce_gui_extra
 
 # --------------------------------------------------------------

source/modules/audio_decoder/Makefile

@@ -8,9 +8,15 @@ include ../../Makefile.mk
 
 # --------------------------------------------------------------
 
-BUILD_C_FLAGS += $(AUDIO_DECODER_FLAGS)
+BUILD_C_FLAGS += $(AUDIO_DECODER_FLAGS) -I..
 LINK_FLAGS    += $(AUDIO_DECODER_LIBS)
 
+OBJS         = ad_ffmpeg.c.o         ad_plugin.c.o         ad_soundfile.c.o
+OBJS_posix32 = ad_ffmpeg.c.posix32.o ad_plugin.c.posix32.o ad_soundfile.c.posix32.o
+OBJS_posix64 = ad_ffmpeg.c.posix64.o ad_plugin.c.posix64.o ad_soundfile.c.posix64.o
+OBJS_win32   = ad_ffmpeg.c.win32.o   ad_plugin.c.win32.o   ad_soundfile.c.win32.o
+OBJS_win64   = ad_ffmpeg.c.win64.o   ad_plugin.c.win64.o   ad_soundfile.c.win64.o
+
 # --------------------------------------------------------------
 
 all: ../audio_decoder.a
@@ -53,45 +59,20 @@ win64:   ../audio_decoder.win64.a
 
 # --------------------------------------------------------------
 
-serd.c.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) -c -o $@
-
-sord.c.o: sord.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src -c -o $@
-
-sratom.c.o: sratom.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) -c -o $@
-
-audio_decoder.c.o: audio_decoder.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src -c -o $@
-
-# --------------------------------------------------------------
-
-serd.c.%32.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(32BIT_FLAGS) -c -o $@
-
-sord.c.%32.o: sord.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(32BIT_FLAGS) -c -o $@
-
-sratom.c.%32.o: sratom.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(32BIT_FLAGS) -c -o $@
-
-audio_decoder.c.%32.o: audio_decoder.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src $(32BIT_FLAGS) -c -o $@
-
-# --------------------------------------------------------------
+%.c.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) -c -o $@
 
-serd.c.%64.o: serd.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iserd-$(SERD_VERSION) $(64BIT_FLAGS) -c -o $@
+%.c.posix32.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-sord.c.%64.o: sord.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isord-$(SORD_VERSION) -Isord-$(SORD_VERSION)/src $(64BIT_FLAGS) -c -o $@
+%.c.posix64.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
 
-sratom.c.%64.o: sratom.c
-	$(CC) $< $(BUILD_C_FLAGS) -Isratom-$(SRATOM_VERSION) $(64BIT_FLAGS) -c -o $@
+%.c.win32.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) $(32BIT_FLAGS) -c -o $@
 
-audio_decoder.c.%64.o: audio_decoder.c
-	$(CC) $< $(BUILD_C_FLAGS) -Iaudio_decoder-$(LILV_VERSION) -Iaudio_decoder-$(LILV_VERSION)/src $(64BIT_FLAGS) -c -o $@
+%.c.win64.o: %.c
+	$(CC) $< $(BUILD_C_FLAGS) $(64BIT_FLAGS) -c -o $@
 
 # --------------------------------------------------------------
 

source/modules/native-plugins/_all.c

@@ -84,8 +84,8 @@ void carla_register_all_plugins()
     carla_register_native_plugin_carla();
 
     // External-UI plugins
-    carla_register_native_plugin_bigmeter();
-    carla_register_native_plugin_notes();
+    //carla_register_native_plugin_bigmeter();
+    //carla_register_native_plugin_notes();
 #endif
 
     // DISTRHO plugins
@@ -93,7 +93,7 @@ void carla_register_all_plugins()
     carla_register_native_plugin_3bandsplitter();
     carla_register_native_plugin_nekobi();
     carla_register_native_plugin_pingpongpan();
-    carla_register_native_plugin_stereoenhancer();
+    //carla_register_native_plugin_stereoenhancer();
 
 #ifdef HAVE_JUCE
     // JUCE based plugins
@@ -113,7 +113,7 @@ void carla_register_all_plugins()
 #endif
 
     // SunVox File
-    carla_register_native_plugin_sunvoxfile();
+    //carla_register_native_plugin_sunvoxfile();
 
 #ifdef WANT_ZYNADDSUBFX
     // ZynAddSubFX

source/plugin/Makefile

@@ -70,23 +70,7 @@ endif
 # --------------------------------------------------------------
 # Native
 
-ifeq ($(HAVE_AF_DEPS),true)
-LINK_FLAGS += $(shell pkg-config --libs sndfile)
-ifeq ($(HAVE_FFMPEG),true)
-LINK_FLAGS += $(shell pkg-config --libs libavcodec libavformat libavutil)
-endif
-endif
-
-ifeq ($(HAVE_MF_DEPS),true)
-LINK_FLAGS += $(shell pkg-config --libs smf)
-endif
-
-ifeq ($(HAVE_ZYN_DEPS),true)
-LINK_FLAGS += $(shell pkg-config --libs fftw3 mxml zlib)
-ifeq ($(HAVE_ZYN_UI_DEPS),true)
-LINK_FLAGS += $(shell pkg-config --libs ntk_images ntk)
-endif
-endif
+LINK_FLAGS += $(NATIVE_PLUGINS_LIBS)
 
 # --------------------------------------------------------------
 # Libs
@@ -98,8 +82,12 @@ LIBS += ../modules/native-plugins.a
 LIBS += ../modules/jackbridge.a
 LIBS += ../modules/rtmempool.a
 
-ifeq ($(CARLA_PLUGIN_SUPPORT),true)
-LIBS += ../modules/lilv.a
+ifeq ($(HAVE_AF_DEPS),true)
+LIBS += ../modules/audio_decoder.a
+endif
+
+ifeq ($(HAVE_DGL),true)
+LIBS += ../modules/dgl.a
 endif
 
 ifeq ($(HAVE_JUCE),true)
@@ -113,8 +101,8 @@ LIBS += ../modules/juce_gui_basics.a
 LIBS += ../modules/juce_gui_extra.a
 endif
 
-ifeq ($(HAVE_DGL),true)
-LIBS += ../modules/dgl.a
+ifeq ($(CARLA_PLUGIN_SUPPORT),true)
+LIBS += ../modules/lilv.a
 endif
 
 # --------------------------------------------------------------