From 50eb332ec8e1fe1e0c367ffefdc25d903e00decd Mon Sep 17 00:00:00 2001
From: Chris Cannam <cannam@all-day-breakfast.com>
Date: Tue, 8 Nov 2022 08:32:05 +0000
Subject: [PATCH] Fixes suitable for mingw32 builds

---
 COMPILING.md            | 13 ++++++++-----
 src/common/FFT.cpp      |  1 +
 src/common/Window.h     |  1 +
 src/faster/SincWindow.h |  1 +
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/COMPILING.md b/COMPILING.md
index 9d07531..be59a22 100644
--- a/COMPILING.md
+++ b/COMPILING.md
@@ -208,11 +208,10 @@ project, and you prefer a Visual Studio project file, you can find a
 simple one in `otherbuilds\rubberband-library.vcxproj`.
 
 The rest of this section describes the "full" build system, which uses
-Meson just as on the other platforms. So to build this way, start by
-ensuring Meson and Ninja are installed and available. Then, in a
-terminal window with the compiler tools available in the path (e.g. a
-Visual Studio command-line prompt for the relevant build architecture)
-run
+Meson, just as on the other platforms. To build this way, first ensure
+Meson and Ninja are installed and available. Then, in a terminal
+window with the compiler tools available in the path (e.g. a Visual
+Studio command-line prompt for the relevant build architecture) run
 
 ```
 > meson build
@@ -232,6 +231,10 @@ option `b_vscrt`:
 > meson build -Db_vscrt=mt
 ```
 
+Accepted arguments include `mt` for the static runtime (`libcmt`),
+`md` for the dynamic one (`msvcrt`), `mtd` for the static debug
+runtime, and `mdd` for the dynamic debug one.
+
 See "FFT and resampler selection" below for further build options.
 
 
diff --git a/src/common/FFT.cpp b/src/common/FFT.cpp
index 66519d2..e715cee 100644
--- a/src/common/FFT.cpp
+++ b/src/common/FFT.cpp
@@ -27,6 +27,7 @@
 #include "Allocators.h"
 #include "VectorOps.h"
 #include "VectorOpsComplex.h"
+#include "mathmisc.h"
 
 // Define USE_FFTW_WISDOM if you are defining HAVE_FFTW3 and you want
 // to use FFTW_MEASURE mode with persistent wisdom files. This will
diff --git a/src/common/Window.h b/src/common/Window.h
index 7364948..bf78a2c 100644
--- a/src/common/Window.h
+++ b/src/common/Window.h
@@ -29,6 +29,7 @@
 #include <map>
 
 #include "sysutils.h"
+#include "mathmisc.h"
 #include "VectorOps.h"
 #include "Allocators.h"
 
diff --git a/src/faster/SincWindow.h b/src/faster/SincWindow.h
index b0441c0..3e70821 100644
--- a/src/faster/SincWindow.h
+++ b/src/faster/SincWindow.h
@@ -30,6 +30,7 @@
 #include <map>
 
 #include "../common/sysutils.h"
+#include "../common/mathmisc.h"
 #include "../common/VectorOps.h"
 #include "../common/Allocators.h"