# HG changeset patch
# User Chris Cannam
# Date 1407494119 -3600
# Node ID eabebfd875edeef21e88c1503eaa2b4d49ccaa5e
# Parent  d632c9b9b8588311e53629f47a76447532fc4eff# Parent  b7f425bb740216a16e7ab8e9bf55bb133534fc3a
Merge

diff -r b7f425bb7402 -r eabebfd875ed Makefile.mingw32
--- a/Makefile.mingw32	Fri Aug 08 11:33:28 2014 +0100
+++ b/Makefile.mingw32	Fri Aug 08 11:35:19 2014 +0100
@@ -6,8 +6,8 @@
 AR		= $(TOOLPREFIX)ar
 RANLIB		= $(TOOLPREFIX)ranlib
 
-CXXFLAGS 	:= $(CXXFLAGS) -DNDEBUG -O3 -fopenmp -msse -msse2 -ffast-math -mfpmath=sse -Wall -Wextra 
-PLUGIN_LDFLAGS 	:= $(LDFLAGS) -shared -static -fopenmp -Wl,--retain-symbols-file=vamp-plugin.list
+CXXFLAGS 	:= $(CXXFLAGS) -DUSE_OWN_ALIGNED_MALLOC -DNDEBUG -O3 -msse -msse2 -ffast-math -mfpmath=sse -Wall -Wextra 
+PLUGIN_LDFLAGS 	:= $(LDFLAGS) -shared -static -Wl,--retain-symbols-file=vamp-plugin.list
 
 VAMPSDK_DIR 	:= ../vamp-plugin-sdk
 PLUGIN_EXT 	:= .dll