Browse Source

Start of experimental plugins; Fix mingw build

tags/1.9.6
falkTX 11 years ago
parent
commit
5e6c59d30f
4 changed files with 33 additions and 0 deletions
  1. +3
    -0
      source/Makefile.mk
  2. +1
    -0
      source/modules/juce_core/native/juce_BasicNativeHeaders.h
  3. +13
    -0
      source/native-plugins/Makefile
  4. +16
    -0
      source/native-plugins/_all.c

+ 3
- 0
source/Makefile.mk View File

@@ -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!



+ 1
- 0
source/modules/juce_core/native/juce_BasicNativeHeaders.h View File

@@ -97,6 +97,7 @@
#define _WIN32_IE 0x0500
#endif
#include <winsock2.h>
#include <windows.h>
#include <shellapi.h>
#include <tchar.h>


+ 13
- 0
source/native-plugins/Makefile View File

@@ -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


+ 16
- 0
source/native-plugins/_all.c View File

@@ -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
}

// -----------------------------------------------------------------------

Loading…
Cancel
Save