Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/xiph/speex.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Matthews <tmatth@videolan.org>2016-07-10 00:03:53 +0300
committerTristan Matthews <tmatth@videolan.org>2016-07-10 19:29:30 +0300
commitb35c295682a3d257ddef4abb8d76e8c7aeff358c (patch)
tree6fbfd36dbd24fdf9390584430ccfb92046be6c7d
parent9172c7ef85fbf058027528d48ededbc7ca847908 (diff)
autotools: fix linking for building speexdec with mingw
Reported by Roger Pack.
-rw-r--r--configure.ac3
-rw-r--r--src/Makefile.am2
2 files changed, 4 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c4b357e..1659062 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,9 +194,12 @@ AC_ARG_ENABLE(blackfin-asm, [ --enable-blackfin-asm Make use of Blackfin asse
[if test "$enableval" = yes; then
AC_DEFINE([BFIN_ASM], , [Make use of Blackfin assembly optimizations])
fi])
+WINMM_LIBS=""
case $host_os in
uclinux) LDFLAGS="-Wl,-elf2flt=-s100000 $LDFLAGS";;
+ *mingw*) WINMM_LIBS="-lwinmm";;
esac
+AC_SUBST(WINMM_LIBS)
AC_ARG_ENABLE(fixed-point-debug, [ --enable-fixed-point-debug Debug fixed-point implementation],
[if test "$enableval" = yes; then
diff --git a/src/Makefile.am b/src/Makefile.am
index 2cac269..ce870ac 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,5 +24,5 @@ speexenc_LDADD = $(top_builddir)/libspeex/libspeex.la \
speexdec_SOURCES = speexdec.c wav_io.c
speexdec_LDADD = $(top_builddir)/libspeex/libspeex.la \
- $(OGG_LIBS) @FFT_LIBS@
+ $(OGG_LIBS) @WINMM_LIBS@ @FFT_LIBS@