From c34f6bc8e6fe8071fa74248c19bd69afe457f029 Mon Sep 17 00:00:00 2001 From: falkTX Date: Thu, 2 Jun 2022 12:27:27 +0100 Subject: [PATCH] Reorder makefile static plugin target rules Signed-off-by: falkTX --- source/Makefile.deps.mk | 35 +++++++++++++++++----------------- source/native-plugins/external | 2 +- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/source/Makefile.deps.mk b/source/Makefile.deps.mk index a7c31a1fb..fa0632018 100644 --- a/source/Makefile.deps.mk +++ b/source/Makefile.deps.mk @@ -320,6 +320,24 @@ USING_RTAUDIO = true endif endif +# --------------------------------------------------------------------------------------------------------------------- +# Disable features for static plugin target + +ifeq ($(STATIC_PLUGIN_TARGET),true) +HAVE_ALSA = false +HAVE_JACK = false +HAVE_HYLIA = false +HAVE_LIBLO = false +HAVE_PULSEAUDIO = false +HAVE_PYQT = false +HAVE_QT4 = false +HAVE_QT5 = false +HAVE_QT5PKG = false +USING_JUCE = false +USING_JUCE_AUDIO_DEVICES = false +USING_RTAUDIO = false +endif + # --------------------------------------------------------------------------------------------------------------------- # Set libs stuff (part 1) @@ -544,23 +562,6 @@ endif # --------------------------------------------------------------------------------------------------------------------- -ifeq ($(STATIC_PLUGIN_TARGET),true) -HAVE_ALSA = false -HAVE_HYLIA = false -HAVE_JACK = false -HAVE_LIBLO = false -HAVE_PYQT = false -HAVE_QT4 = false -HAVE_QT5 = false -HAVE_QT5PKG = false -HAVE_PULSEAUDIO = false -USING_JUCE = false -USING_JUCE_AUDIO_DEVICES = false -USING_RTAUDIO = false -endif - -# --------------------------------------------------------------------------------------------------------------------- - AUDIO_DECODER_LIBS = $(FFMPEG_LIBS) AUDIO_DECODER_LIBS += $(SNDFILE_LIBS) diff --git a/source/native-plugins/external b/source/native-plugins/external index f69a9e9ab..bc1bbf3b1 160000 --- a/source/native-plugins/external +++ b/source/native-plugins/external @@ -1 +1 @@ -Subproject commit f69a9e9abdc03e9d124656215839c0fe025a783a +Subproject commit bc1bbf3b12bd0638707a8e3a84079b241224db3e