From 0a2ad6e09e71fde0c87f36cd40bc3e1f295656c7 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Fri, 27 Dec 2019 18:12:41 -0600
Subject: [PATCH] Windows dependencies now building, except for mp3 support.

---
 singe/preBuild.sh | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/singe/preBuild.sh b/singe/preBuild.sh
index 5e9f89e7e..ebb7b44da 100755
--- a/singe/preBuild.sh
+++ b/singe/preBuild.sh
@@ -83,6 +83,7 @@ function autoBuild() {
 			autoreconf --force --install || true
 		fi
 		make distclean || true
+		make clean || true
 		popd
 		mkdir -p "${G_DEST}/${LOCATION}"
 		pushd "${G_DEST}/${LOCATION}"
@@ -103,7 +104,7 @@ function autoBuild() {
 				--arch=${G_ARCH} \
 				--enable-static \
 				--disable-shared \
-				--program-suffix="" \
+				--progs-suffix="" \
 				--prefix="${G_INSTALLED}" ${OPTIONS}
 		else
 			"${G_THIRDPARTY}/${LOCATION}/configure" \
@@ -332,10 +333,10 @@ autoBuild libSDL2.a SDL2
 autoBuild libSDL2_image.a SDL2_image "--disable-jpg-shared --disable-png-shared --disable-tif-shared --disable-webp-shared"
 
 # === SDL2_mixer ===
-LIBS="-lm" \
-	MORE_LIBS="-lstdc++" \
+MODPLUG_CFLAGS="-I${G_INSTALLED}/include -DMODPLUG_STATIC" \
+	MODPLUG_LIBS="-L${G_INSTALLED}/lib -lmodplug -lstdc++ -lm" \
 	autoBuild libSDL2_mixer.a SDL2_mixer "--disable-music-midi-fluidsynth --disable-music-ogg-shared --disable-music-flac-shared --disable-music-mod-modplug-shared --disable-music-mp3-mpg123-shared --disable-music-opus-shared"
 
 # === SDL2_ttf ===
 MORE_CFLAGS="-I${G_INSTALLED}/include/SDL2" \
-	autoBuild libSDL2_ttf.a SDL2_ttf "--with-ft-prefix=\"${G_INSTALLED}\" --with-sdl-prefix=\"${G_INSTALLED}\""
+	autoBuild libSDL2_ttf.a SDL2_ttf "--with-ft-prefix=\"${G_INSTALLED}\" --with-sdl-prefix=\"${G_INSTALLED}\"" "libSDL2_ttf.la install-libLTLIBRARIES install-libSDL2_ttfincludeHEADERS"