X-Git-Url: https://git.aubio.org/?p=vamp-aubio-plugins.git;a=blobdiff_plain;f=Makefile.mingw32;h=e9a734007d252ff3ce2cf5d2487aa4ac1c256ce9;hp=3229a1476a37459815abef4a1ccfae859e2a9a71;hb=e58392f4dc5f0547711470d8f74842c074458392;hpb=4e3715f3534bdce3e7f819b59dd7267897d72bc8;ds=sidebyside

diff --git a/Makefile.mingw32 b/Makefile.mingw32
index 3229a14..e9a7340 100644
--- a/Makefile.mingw32
+++ b/Makefile.mingw32
@@ -6,7 +6,18 @@
 ##  Note that the list of source files, etc, goes in Makefile.inc
 ##  instead so that it can be included by all platform Makefiles.
 
-TOOLPREFIX     ?=
+# Location of Vamp plugin SDK relative to the project directory
+VAMPSDK_DIR	?= ../vamp-plugin-sdk-2.5
+
+# Location of libvamp-sdk.dll
+VAMPBIN_DIR ?= ../vamp-plugin-sdk-2.5-binaries-win32-mingw
+
+# Location of cross compiled and installed aubio tree
+AUBIO_MINGW32_DISTDIR ?= ../aubio-dist-mingw32
+
+# Toolchain prefix
+TOOLPREFIX     ?= i586-mingw32msvc-
+
 CXX		= $(TOOLPREFIX)g++
 CC		= $(TOOLPREFIX)gcc
 LD		= $(TOOLPREFIX)g++
@@ -19,20 +30,17 @@ RANLIB		= $(TOOLPREFIX)ranlib
 # ... or for a release build
 CFLAGS		:= -Wall -Wextra -O3 -ftree-vectorize
 
-# Location of Vamp plugin SDK relative to the project directory
-VAMPSDK_DIR	?= ../vamp-plugin-sdk
+# add AUBIO_MINGW32_DISTDIR to ARCHFLAGS
+ARCHFLAGS := -I$(AUBIO_MINGW32_DISTDIR)/usr/local/include
 
-# Location of libvamp-sdk.dll
-VAMPDLL_DIR ?= ../vamp-plugin-sdk-2.5-binaries-win32-mingw
-
-# Location of libaubio-4.dll
-AUBIODLL_DIR ?= ../../dist-win32/usr/local/lib
+# add AUBIO_MINGW32_DISTDIR to PLUGIN_LDFLAGS
+PLUGIN_LDFLAGS  := -L$(AUBIO_MINGW32_DISTDIR)/usr/local/lib
 
 # Libraries and linker flags required by plugin: add any -l<library>
 # options here
-PLUGIN_LDFLAGS	:= -shared -Wl,--retain-symbols-file=vamp-plugin.list
-PLUGIN_LIBS			:= $(VAMPDLL_DIR)/libvamp-sdk.dll $(AUBIODLL_DIR)/libaubio-4.dll
-
+PLUGIN_LDFLAGS  += -Wl,--enable-auto-import
+PLUGIN_LDFLAGS  += -shared -Wl,--retain-symbols-file=vamp-plugin.list
+PLUGIN_LIBS     := $(VAMPBIN_DIR)/libvamp-sdk.dll
 
 # File extension for plugin library on this platform
 PLUGIN_EXT	:= .dll