diff options
| author | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2007-12-08 13:07:00 +0300 |
|---|---|---|
| committer | jm <jm@0101bb08-14d6-0310-b084-bc0e0c8e3800> | 2007-12-08 13:07:00 +0300 |
| commit | dd01771b2a0dda3d9fff458ee88d504cbc4b23ef (patch) | |
| tree | 26ff5c37f9f6155090fa07c2e5916e2af0c54203 | |
| parent | c0c8853f11a8298e460f65dea6e64ca966925d90 (diff) | |
MinGW support by mikael Magnusson and last updates for 1.2beta3.Speex-1.2beta3
git-svn-id: http://svn.xiph.org/trunk/speex@14283 0101bb08-14d6-0310-b084-bc0e0c8e3800
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | doc/manual.pdf | bin | 441539 -> 439545 bytes | |||
| -rw-r--r-- | libspeex/arch.h | 2 | ||||
| -rw-r--r-- | src/speexdec.c | 2 | ||||
| -rw-r--r-- | src/speexenc.c | 2 | ||||
| -rw-r--r-- | ti/Makefile.am | 2 |
6 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index d1061c2..53205a2 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AM_CONFIG_HEADER([config.h]) SPEEX_MAJOR_VERSION=1 SPEEX_MINOR_VERSION=1 SPEEX_MICRO_VERSION=15 -SPEEX_EXTRA_VERSION=-git +SPEEX_EXTRA_VERSION= #SPEEX_VERSION= #SPEEX_VERSION=$SPEEX_MAJOR_VERSION.$SPEEX_MINOR_VERSION.$SPEEX_MICRO_VERSION$SPEEX_EXTRA_VERSION SPEEX_VERSION="1.2beta3" @@ -30,6 +30,7 @@ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define) AM_MAINTAINER_MODE AC_CANONICAL_HOST +AC_LIBTOOL_WIN32_DLL AM_PROG_LIBTOOL AC_C_BIGENDIAN @@ -50,7 +51,7 @@ has_var_arrays=no ) AC_MSG_RESULT($has_var_arrays) -AC_CHECK_HEADERS(alloca.h) +AC_CHECK_HEADERS([alloca.h getopt.h]) AC_MSG_CHECKING(for alloca) AC_TRY_COMPILE( [ #ifdef HAVE_ALLOCA_H diff --git a/doc/manual.pdf b/doc/manual.pdf Binary files differindex 23b9da9..292f304 100644 --- a/doc/manual.pdf +++ b/doc/manual.pdf diff --git a/libspeex/arch.h b/libspeex/arch.h index ec3c901..ccd24ae 100644 --- a/libspeex/arch.h +++ b/libspeex/arch.h @@ -40,7 +40,7 @@ #define SPEEX_MINOR_VERSION 1 /**< Minor Speex version. */ #define SPEEX_MICRO_VERSION 15 /**< Micro Speex version. */ #define SPEEX_EXTRA_VERSION "" /**< Extra Speex version. */ -#define SPEEX_VERSION "speex-1.2beta4" /**< Speex version string. */ +#define SPEEX_VERSION "speex-1.2beta3" /**< Speex version string. */ #endif /* A couple test to catch stupid option combinations */ diff --git a/src/speexdec.c b/src/speexdec.c index b8252b5..76b6892 100644 --- a/src/speexdec.c +++ b/src/speexdec.c @@ -36,6 +36,8 @@ #include <stdio.h> #if !defined WIN32 && !defined _WIN32 #include <unistd.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> #endif #ifndef HAVE_GETOPT_LONG diff --git a/src/speexenc.c b/src/speexenc.c index 52f7117..2d1e639 100644 --- a/src/speexenc.c +++ b/src/speexenc.c @@ -36,6 +36,8 @@ #include <stdio.h> #if !defined WIN32 && !defined _WIN32 #include <unistd.h> +#endif +#ifdef HAVE_GETOPT_H #include <getopt.h> #endif #ifndef HAVE_GETOPT_LONG diff --git a/ti/Makefile.am b/ti/Makefile.am index 0b3bc68..200ca19 100644 --- a/ti/Makefile.am +++ b/ti/Makefile.am @@ -5,5 +5,5 @@ SUBDIRS = speex_C54_test speex_C55_test speex_C64_test -EXTRA_DIST = config.h testenc-TI-C5x.c user_misc.h testenc-TI-C64x.c +EXTRA_DIST = config.h testenc-TI-C5x.c os_support_custom.h testenc-TI-C64x.c |