# HG changeset patch
# User John Donoghue
# Date 1424901277 18000
# Node ID b854e159f3e342baafa99b696aba6095d58549b7
# Parent  c7c1065c12e072998856e24258bd597a1cdcbbfe
fftw.mk: compile threading and other fftw.org suggestions into mingw dlls

* src/fftw.mk: add mingw options --with-combined-threads --with-incoming-stack-boundary=2

diff -r c7c1065c12e0 -r b854e159f3e3 src/fftw.mk
--- a/src/fftw.mk	Wed Feb 25 13:18:35 2015 -0500
+++ b/src/fftw.mk	Wed Feb 25 16:54:37 2015 -0500
@@ -10,11 +10,20 @@
 $(PKG)_URL      := http://www.fftw.org/$($(PKG)_FILE)
 $(PKG)_DEPS     :=
 
+$(PKG)_CONFIG_OPTS :=
+
 ifeq ($(MXE_SYSTEM),msvc)
     $(PKG)_HAVE_LONG_DOUBLE := false
 else
     $(PKG)_HAVE_LONG_DOUBLE := true
-    $(PKG)_CONFIG_OPTS := --with-our-malloc
+    $(PKG)_CONFIG_OPTS += --with-our-malloc
+endif
+
+# some suggested mingw fftw settings from www.fftw.org
+ifeq ($(MXE_SYSTEM),mingw)
+    $(PKG)_CONFIG_OPTS += \
+      --with-combined-threads \
+      --with-incoming-stack-boundary=2
 endif
 
 define $(PKG)_UPDATE
@@ -29,6 +38,8 @@
     if [ $(MXE_SYSTEM) = msvc ]; then \
         $(SED) -i -e 's,-lm\>,,' '$(1)/fftw.pc.in'; \
     fi
+
+    # default is double
     cd '$(1)' && ./configure \
         F77=$(MXE_F77) \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
@@ -37,7 +48,7 @@
         --enable-threads \
         --enable-sse2 \
         $($(PKG)_CONFIG_OPTS) \
-        --enable-double && $(CONFIGURE_POST_HOOK)
+        && $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
     $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= DESTDIR='$(3)'