From 5e6c59d30f17faafcab4a2250376d85525b4982e Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Wed, 14 Jan 2015 13:16:32 +0000
Subject: [PATCH] Start of experimental plugins; Fix mingw build

---
 source/Makefile.mk                               |  3 +++
 .../juce_core/native/juce_BasicNativeHeaders.h   |  1 +
 source/native-plugins/Makefile                   | 13 +++++++++++++
 source/native-plugins/_all.c                     | 16 ++++++++++++++++
 4 files changed, 33 insertions(+)

diff --git a/source/Makefile.mk b/source/Makefile.mk
index 759ee4553..25b05f720 100644
--- a/source/Makefile.mk
+++ b/source/Makefile.mk
@@ -10,6 +10,9 @@
 # Use the free vestige header instead of the official VST SDK
 CARLA_VESTIGE_HEADER = true
 
+# Enable experimental plugins, don't complain if the build fails when using this!
+EXPERIMENTAL_PLUGINS = false
+
 # --------------------------------------------------------------
 # DO NOT MODIFY PAST THIS POINT!
 
diff --git a/source/modules/juce_core/native/juce_BasicNativeHeaders.h b/source/modules/juce_core/native/juce_BasicNativeHeaders.h
index 55c0c8c30..94c47ab93 100644
--- a/source/modules/juce_core/native/juce_BasicNativeHeaders.h
+++ b/source/modules/juce_core/native/juce_BasicNativeHeaders.h
@@ -97,6 +97,7 @@
   #define _WIN32_IE 0x0500
  #endif
 
+ #include <winsock2.h>
  #include <windows.h>
  #include <shellapi.h>
  #include <tchar.h>
diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile
index ce467e4a8..fa55801be 100644
--- a/source/native-plugins/Makefile
+++ b/source/native-plugins/Makefile
@@ -23,6 +23,11 @@ ifeq ($(HAVE_ZYN_DEPS),true)
 ALL_C_FLAGS += -DWANT_ZYNADDSUBFX
 endif
 
+# Experimental plugins
+ifeq ($(EXPERIMENTAL_PLUGINS),true)
+ALL_C_FLAGS += -DWANT_EXPERIMENTAL_PLUGINS
+endif
+
 # ----------------------------------------------------------------------------------------------------------------------------
 # Flags for ZynAddSubFX
 
@@ -123,6 +128,14 @@ ZYN_UI_FILES_H = \
 endif
 endif
 
+# ----------------------------------------------------------------------------------------------------------------------------
+# Experimental plugins
+
+ifeq ($(EXPERIMENTAL_PLUGINS),true)
+OBJS += \
+	$(OBJDIR)/zita-jaaa.cpp.o
+endif
+
 # ----------------------------------------------------------------------------------------------------------------------------
 
 all: $(MODULEDIR)/$(MODULENAME).a
diff --git a/source/native-plugins/_all.c b/source/native-plugins/_all.c
index 9ce8ebac9..bd7c92c30 100644
--- a/source/native-plugins/_all.c
+++ b/source/native-plugins/_all.c
@@ -17,6 +17,8 @@
 
 #include "CarlaDefines.h"
 
+// -----------------------------------------------------------------------
+
 // Simple plugins
 extern void carla_register_native_plugin_bypass(void);
 extern void carla_register_native_plugin_lfo(void);
@@ -52,6 +54,13 @@ extern void carla_register_native_plugin_zynaddsubfx_fx(void);
 extern void carla_register_native_plugin_zynaddsubfx_synth(void);
 #endif
 
+#ifdef WANT_EXPERIMENTAL_PLUGINS
+// Experimental plugins
+extern void carla_register_native_plugin_zita_jaaa(void);
+#endif
+
+// -----------------------------------------------------------------------
+
 void carla_register_all_plugins(void);
 
 void carla_register_all_plugins(void)
@@ -90,4 +99,11 @@ void carla_register_all_plugins(void)
     carla_register_native_plugin_zynaddsubfx_fx();
     carla_register_native_plugin_zynaddsubfx_synth();
 #endif
+
+#ifdef WANT_EXPERIMENTAL_PLUGINS
+    // Experimental plugins
+    carla_register_native_plugin_zita_jaaa();
+#endif
 }
+
+// -----------------------------------------------------------------------