Configurable paths (config.sh + generated env), vendored speech.h, merge docs

setup/run.sh

@@ -1,27 +1,25 @@
 #!/bin/sh
-# Run the SAPI4 host with the project's wine prefix and a working X display.
+# Run the SAPI4 host with the configured wine prefix and X display.
 # Usage: setup/run.sh [sapi4host args...]
 set -eu
 
 HERE=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
-ROOT=$(CDPATH= cd -- "$HERE/.." && pwd)
-export WINEPREFIX=${WINEPREFIX:-$HOME/.wine-microslopsam}
-export WINEARCH=win32
+. "$HERE/config.sh"
 
 if [ -z "${DISPLAY:-}" ]; then
-    if ! [ -S /tmp/.X11-unix/X77 ]; then
-        Xvfb :77 -screen 0 1024x768x24 >/dev/null 2>&1 &
+    if ! [ -S "$MICROSLOP_XSOCK" ]; then
+        "$MICROSLOP_XVFB" "$MICROSLOP_DISPLAY" -screen 0 1024x768x24 >/dev/null 2>&1 &
         sleep 1
     fi
-    export DISPLAY=:77
+    export DISPLAY=$MICROSLOP_DISPLAY
 fi
 
-HOST="$ROOT/build/sapi4host-winlib.exe"
+HOST="$MICROSLOP_BUILD/sapi4host-winlib.exe"
 if [ ! -x "$HOST" ]; then
-    HOST="$ROOT/build/sapi4host.exe"
+    HOST="$MICROSLOP_BUILD/sapi4host.exe"
 fi
 if [ ! -x "$HOST" ]; then
-    echo "no host binary; build first (see README)" >&2
+    echo "no host binary; run setup/install.sh first" >&2
     exit 1
 fi