Merge in changes from OSX.

scripts/coverage_reset.sh

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+
+mv -f ./subprojects/packagecache .
+rm -rf subprojects builddir
+mkdir subprojects
+mv packagecache ./subprojects/
+mkdir builddir
+cp wraps/*.wrap subprojects/
+# on OSX you can't do this with static
+meson setup -Db_coverage=true builddir

scripts/reset_build.sh

@@ -8,4 +8,4 @@ mv packagecache ./subprojects/
 mkdir builddir
 cp wraps/*.wrap subprojects/
 # on OSX you can't do this with static
-meson setup -Db_coverage=true builddir
+meson setup builddir

tools/designer.cpp

@@ -16,6 +16,7 @@
 #include <codecvt>
 #include <vector>
 #include <nlohmann/json.hpp>
+#include <algorithm>
 
 using namespace nlohmann;
 using namespace fmt;