Make it possible to skip zyn-synth as plugin

data/linux/build-all.sh

@@ -25,6 +25,7 @@ source common.env
 
 CHROOT_CARLA_DIR="/tmp/carla-src"
 PKG_FOLDER="Carla_2.0-beta6-linux"
+export MAKE_ARGS="${MAKE_ARGS} SKIP_ZYN_SYNTH=true"
 
 # ---------------------------------------------------------------------------------------------------------------------
 # function to remove old stuff

source/native-plugins/_all.all.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,7 +19,6 @@
 #include "CarlaNative.h"
 
 #ifdef CARLA_OS_WIN
-# define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
 # undef HAVE_PYQT
 #endif
 

source/native-plugins/_all.base.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -19,7 +19,6 @@
 #include "CarlaNative.h"
 
 #ifdef CARLA_OS_WIN
-# define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
 # undef HAVE_PYQT
 #endif
 

source/native-plugins/_data.all.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,7 +20,6 @@
 #include "CarlaUtils.hpp"
 
 #ifdef CARLA_OS_WIN
-# define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
 # undef HAVE_PYQT
 #endif
 

source/native-plugins/_data.base.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -20,7 +20,6 @@
 #include "CarlaUtils.hpp"
 
 #ifdef CARLA_OS_WIN
-# define DISABLE_PLUGINS_FOR_WINDOWS_BUILD
 # undef HAVE_PYQT
 #endif
 

source/native-plugins/external/Makefile

@@ -37,7 +37,7 @@ OBJS_all += \
 	$(OBJDIR)/zynaddsubfx-fx.cpp.o \
 	$(OBJDIR)/zynaddsubfx-src.cpp.o
 
-ifneq ($(MACOS_OR_WIN32),true)
+ifneq ($(SKIP_ZYN_SYNTH),true)
 OBJS_all += \
 	$(OBJDIR)/zynaddsubfx-synth.cpp.o
 endif

source/native-plugins/external/Makefile.mk

@@ -12,6 +12,7 @@ endif
 
 ifeq ($(MACOS_OR_WIN32),true)
 HAVE_DGL = true
+SKIP_ZYN_SYNTH = true
 else
 HAVE_DGL = $(shell pkg-config --exists gl x11 && echo true)
 endif
@@ -125,6 +126,9 @@ ZYN_DSP_FLAGS += $(shell pkg-config --cflags fftw3 zlib)
 ZYN_DSP_LIBS   = $(ZYN_BASE_LIBS)
 ZYN_DSP_LIBS  += $(shell pkg-config --libs fftw3 zlib)
 
+ifeq ($(SKIP_ZYN_SYNTH),true)
+ZYN_DSP_LIBS  += -DSKIP_ZYN_SYNTH
+else
 # UI flags
 ifeq ($(HAVE_ZYN_UI_DEPS),true)
 
@@ -156,6 +160,7 @@ else  # HAVE_ZYN_UI_DEPS
 
 ZYN_DSP_FLAGS += -DNO_UI
 
+endif # SKIP_ZYN_SYNTH
 endif # HAVE_ZYN_UI_DEPS
 endif # HAVE_ZYN_DEPS
 

source/native-plugins/external/_all.c

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -62,7 +62,7 @@ void carla_register_all_native_external_plugins(void)
 #ifdef HAVE_ZYN_DEPS
     // ZynAddSubFX
     carla_register_native_plugin_zynaddsubfx_fx();
-# ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# ifndef SKIP_ZYN_SYNTH
     carla_register_native_plugin_zynaddsubfx_synth();
 # endif
 #endif

source/native-plugins/external/_data.cpp

@@ -1,6 +1,6 @@
 /*
  * Carla Native Plugins
- * Copyright (C) 2012-2017 Filipe Coelho <falktx@falktx.com>
+ * Copyright (C) 2012-2018 Filipe Coelho <falktx@falktx.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -356,7 +356,7 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
     /* copyright */ "GNU GPL v2+",
     DESCFUNCS
 },
-# ifndef DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# ifndef SKIP_ZYN_SYNTH
 {
     /* category  */ NATIVE_PLUGIN_CATEGORY_SYNTH,
     /* hints     */ static_cast<NativePluginHints>(NATIVE_PLUGIN_IS_SYNTH
@@ -381,7 +381,7 @@ static const NativePluginDescriptor sNativePluginDescriptors[] = {
     /* copyright */ "GNU GPL v2+",
     DESCFUNCS
 },
-# endif // ! DISABLE_PLUGINS_FOR_WINDOWS_BUILD
+# endif // ! SKIP_ZYN_SYNTH
 #endif // HAVE_ZYN_DEPS
 
 // --------------------------------------------------------------------------------------------------------------------