From 8c9edf7d51e49d36772a5f1814c74251ca41a2a9 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sat, 13 Nov 2021 18:39:17 +0000
Subject: [PATCH] Add static-plugin target, fix some warnings

---
 Makefile                                   | 9 +++++++++
 source/backend/Makefile                    | 2 ++
 source/backend/utils/Information.cpp       | 6 ++++--
 source/modules/zita-resampler/resampler.h  | 1 -
 source/modules/zita-resampler/vresampler.h | 1 -
 source/plugin/Makefile                     | 2 ++
 6 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 9c25aab4e..9265b1ab2 100644
--- a/Makefile
+++ b/Makefile
@@ -216,6 +216,15 @@ rest: libs
 theme: libs
 	@$(MAKE) -C source/theme
 
+# ---------------------------------------------------------------------------------------------------------------------
+# static targets
+
+static-backend: libs
+	@$(MAKE) -C source/backend static
+
+static-plugin: static-backend
+	@$(MAKE) -C source/plugin static
+
 # ---------------------------------------------------------------------------------------------------------------------
 # hacks
 
diff --git a/source/backend/Makefile b/source/backend/Makefile
index eb6585088..2de948f79 100644
--- a/source/backend/Makefile
+++ b/source/backend/Makefile
@@ -109,6 +109,8 @@ endif
 all: $(TARGETS)
 	$(MAKE) -C utils
 
+static: $(OBJS_standalone)
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 clean:
diff --git a/source/backend/utils/Information.cpp b/source/backend/utils/Information.cpp
index e0f15e827..c6dfd0c94 100644
--- a/source/backend/utils/Information.cpp
+++ b/source/backend/utils/Information.cpp
@@ -36,7 +36,9 @@
 #ifdef USING_JUCE
 # include "AppConfig.h"
 # include "juce_core/juce_core.h"
-#else
+#endif
+
+#ifdef USING_RTAUDIO
 # include "rtaudio/RtAudio.h"
 # include "rtmidi/RtMidi.h"
 #endif
@@ -94,7 +96,7 @@ const char* carla_get_complete_license_text()
 #endif
         "<li>rtmempool library by Nedko Arnaudov"
         "<li>serd, sord, sratom and lilv libraries for LV2 discovery</li>"
-#ifndef USING_JUCE
+#ifdef USING_RTAUDIO
         "<li>RtAudio v" RTAUDIO_VERSION " and RtMidi v" RTMIDI_VERSION " for native Audio and MIDI support</li>"
 #endif
         "<li>zita-resampler for audio file sample rate resampling</li>"
diff --git a/source/modules/zita-resampler/resampler.h b/source/modules/zita-resampler/resampler.h
index 6f9eb4362..ace45d551 100644
--- a/source/modules/zita-resampler/resampler.h
+++ b/source/modules/zita-resampler/resampler.h
@@ -69,7 +69,6 @@ private:
     unsigned int         _phase;
     unsigned int         _pstep;
     float               *_buff;
-    void                *_dummy [8];
 };
 
 
diff --git a/source/modules/zita-resampler/vresampler.h b/source/modules/zita-resampler/vresampler.h
index ff6fc0432..41e1111f5 100644
--- a/source/modules/zita-resampler/vresampler.h
+++ b/source/modules/zita-resampler/vresampler.h
@@ -77,7 +77,6 @@ private:
     float               *_buff;
     float               *_c1;
     float               *_c2;
-    void                *_dummy [8];
 };
 
 
diff --git a/source/plugin/Makefile b/source/plugin/Makefile
index 655f79a38..efd9d62df 100644
--- a/source/plugin/Makefile
+++ b/source/plugin/Makefile
@@ -213,6 +213,8 @@ else
 wine: $(BINDIR)/CarlaVstShellBridged.dll.so $(BINDIR)/CarlaVstFxShellBridged.dll.so
 endif
 
+static: $(OBJDIR)/carla-host-plugin.cpp.o
+
 # ---------------------------------------------------------------------------------------------------------------------
 
 BUNDLES = audiogain files miditools