From c3b210ef14348dafd694fde2f39142011d052616 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 12 Mar 2016 14:35:35 +0100 Subject: [PATCH] Fix real mingw build --- source/modules/juce_audio_devices/Makefile | 1 + source/native-plugins/Makefile | 5 ++++- source/native-plugins/zynaddsubfx-src.cpp | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/source/modules/juce_audio_devices/Makefile b/source/modules/juce_audio_devices/Makefile index d4d41e751..4910fd058 100644 --- a/source/modules/juce_audio_devices/Makefile +++ b/source/modules/juce_audio_devices/Makefile @@ -13,6 +13,7 @@ include ../Makefile.mk BUILD_CXX_FLAGS += $(JUCE_AUDIO_DEVICES_FLAGS) -I.. ifeq ($(WIN32),true) +BUILD_CXX_FLAGS += -Wno-missing-field-initializers # BUILD_CXX_FLAGS += -I$(CWD)/includes/asio BUILD_CXX_FLAGS += -I$(CWD)/modules/rtaudio/include endif diff --git a/source/native-plugins/Makefile b/source/native-plugins/Makefile index 1b7b962fb..17d24d1d1 100644 --- a/source/native-plugins/Makefile +++ b/source/native-plugins/Makefile @@ -30,10 +30,13 @@ endif # EXPERIMENTAL_PLUGINS # Flags for ZynAddSubFX ifeq ($(HAVE_ZYN_DEPS),true) -ZYN_CXX_FLAGS = $(BUILD_CXX_FLAGS) -DHAVE_ASYNC -Izynaddsubfx -Izynaddsubfx/rtosc +ZYN_CXX_FLAGS = $(BUILD_CXX_FLAGS) -Izynaddsubfx -Izynaddsubfx/rtosc ZYN_CXX_FLAGS += $(shell pkg-config --cflags fftw3 mxml zlib) ZYN_LD_FLAGS = $(shell pkg-config --libs liblo) ZYN_LD_FLAGS += -ldl -lpthread +ifneq ($(WIN32),true) +ZYN_CXX_FLAGS += -DHAVE_ASYNC +endif ifeq ($(HAVE_X11),true) ZYN_CXX_FLAGS += $(shell pkg-config --cflags x11) ZYN_LD_FLAGS += $(shell pkg-config --libs x11) diff --git a/source/native-plugins/zynaddsubfx-src.cpp b/source/native-plugins/zynaddsubfx-src.cpp index b16225c23..eff15a8dd 100644 --- a/source/native-plugins/zynaddsubfx-src.cpp +++ b/source/native-plugins/zynaddsubfx-src.cpp @@ -21,6 +21,7 @@ # include # define errx(...) {} # define warnx(...) {} +# define index strchr # define rindex strrchr #else # include