DPF

commit 697293675f5f085e71edd37e997229fc6c7e0ddb
parent 1add41ad99e983e19d539efaa19842b5cfba3e10
Author: falkTX <falktx@falktx.com>
Date:   Sat, 12 Mar 2022 13:11:39 +0000

Really fix static build for standalone

Signed-off-by: falkTX <falktx@falktx.com>

Diffstat:
M
Makefile.plugins.mk
 | 
4
++++
M
distrho/src/DistrhoPluginJACK.cpp
 | 
11
+++++++++--

2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Makefile.plugins.mk b/Makefile.plugins.mk
@@ -46,6 +46,10 @@ ifeq ($(HAVE_PULSEAUDIO),true)
 BASE_FLAGS += -DHAVE_PULSEAUDIO
 endif
 
+ifeq ($(STATIC_BUILD),true)
+JACK_LIBS  += $(shell $(PKG_CONFIG) --libs jack)
+endif
+
 ifeq ($(MACOS),true)
 JACK_LIBS  += -framework CoreAudio -framework CoreFoundation
 else ifeq ($(WINDOWS),true)
diff --git a/distrho/src/DistrhoPluginJACK.cpp b/distrho/src/DistrhoPluginJACK.cpp
@@ -1,6 +1,6 @@
 /*
  * DISTRHO Plugin Framework (DPF)
- * Copyright (C) 2012-2021 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2022 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -15,7 +15,10 @@
  */
 
 #include "DistrhoPluginInternal.hpp"
-#include "../DistrhoPluginUtils.hpp"
+
+#if !defined(DISTRHO_OS_WINDOWS) && !defined(STATIC_BUILD)
+# include "../DistrhoPluginUtils.hpp"
+#endif
 
 #if DISTRHO_PLUGIN_HAS_UI
 # include "DistrhoUIInternal.hpp"
@@ -28,6 +31,10 @@
 # include "../extra/Thread.hpp"
 #endif
 
+#ifdef STATIC_BUILD
+# define JACKBRIDGE_DIRECT
+#endif
+
 #include "jackbridge/JackBridge.cpp"
 #include "lv2/lv2.h"