ref: 3c6126af1d5f7292657d1413714cfddfd216d397
parent: 388af59ea6626b498d9c0cc659762ea46c17ec81
author: Chris Bagwell <chris@cnpbagwell.com>
date: Sun Jan 13 08:47:21 EST 2013
mingw script updates
--- a/mingwbuild
+++ b/mingwbuild
@@ -29,24 +29,23 @@
# The following command lines were used to generate the static external
# libraries SoX ships with.
#
-# cd libtool-2.2.6b
+# cd libtool-2.4.2
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
#
# libpng.la will have libtool issue because depends on libz
# which has a libz.la file. Must edit libpng.la to
# prevent needing to distribute zlib1.dll.
-# cd libpng-1.2.41
+# cd libpng-1.5.7
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
#
-# MINGW work around: had to comment out "cli" from SUBDIR.
# cd ../wavpack-4.60.1
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
#
-# MINGW fixes for FLAC: Needed to edit include/share/alloc.h and remove
-# !defined __MINGW32__ check so that stdint.h is included.
+# Need to disable optional ogg support to prevent duplicate symbols during
+# link.
# Edited Makefile and removed "examples" from SUBDIRS.
# cd ../flac-1.2.1
-# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
+# mingw32-configure --disable-ogg --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
#
# cd ../libogg-1.3.0
# mingw32-configure --disable-shared --enable-static;mingw32-make;sudo mingw32-make install
@@ -86,15 +85,15 @@
STRIP=strip
;;
*)
- SYS_ROOT="/usr/i686-pc-mingw32/sys-root"
+ SYS_ROOT="/usr/i686-w64-mingw32/sys-root"
CONFIGURE=mingw32-configure
DOC_TARGETS="pdf"
DOCS="sox.pdf soxformat.pdf soxi.pdf"
- TMP_SNDFILE_LIBS="-lsndfile -lFLAC -lwsock32 -lvorbisenc -lvorbisfile -lvorbis -logg"
+ TMP_SNDFILE_LIBS="-lsndfile -lFLAC -lvorbisenc -lvorbisfile -lvorbis -logg"
# TODO: libFLAC is referencing ntohl() but not defining it in their
# flac.pc. Its not obvious how upstream is going to fix this issue
# so work around in script for now.
- TMP_FLAC_LIBS="-lwsock32"
+ #TMP_FLAC_LIBS="-lwsock32"
STRIP=i686-pc-mingw32-strip
esac