From 619a9681bc03248a4d61efe1c7cb6530f71ab192 Mon Sep 17 00:00:00 2001 From: Jean-Marc Valin Date: Sat, 16 Jan 2010 19:12:06 -0500 Subject: Misc changes for 0.7.1. --- README.Win32 | 10 ++++++++++ celt.pc.in | 3 ++- configure.ac | 2 +- libcelt/os_support.h | 10 +++++----- 4 files changed, 18 insertions(+), 7 deletions(-) create mode 100644 README.Win32 diff --git a/README.Win32 b/README.Win32 new file mode 100644 index 0000000..4694994 --- /dev/null +++ b/README.Win32 @@ -0,0 +1,10 @@ +Here are a few tips for building on Windows: + +1) Create a config.h file that defines out things that defines out all the + features that your compiler doesn't understand (e.g. inline, restrict). + It also needs to define the CELT_BUILD macro + +2) Define the HAVE_CONFIG_H macro in the project build options (NOT in config.h) + +3) If you want things to be a lot easier, just use a compiler that supports + C99, such as gcc diff --git a/celt.pc.in b/celt.pc.in index 67a830b..8a89064 100644 --- a/celt.pc.in +++ b/celt.pc.in @@ -10,5 +10,6 @@ Description: CELT is a low-delay audio codec Version: @CELT_VERSION@ Requires: Conflicts: -Libs: -L${libdir} -lcelt@LIBCELT_SUFFIX@ -lm +Libs: -L${libdir} -lcelt@LIBCELT_SUFFIX@ +Libs.private: -lm Cflags: -I${includedir} diff --git a/configure.ac b/configure.ac index 7c9d4ad..95d3703 100644 --- a/configure.ac +++ b/configure.ac @@ -6,7 +6,7 @@ AM_CONFIG_HEADER([config.h]) CELT_MAJOR_VERSION=0 CELT_MINOR_VERSION=7 -CELT_MICRO_VERSION=0 +CELT_MICRO_VERSION=1 CELT_EXTRA_VERSION= CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION LIBCELT_SUFFIX=0 diff --git a/libcelt/os_support.h b/libcelt/os_support.h index f72c2ec..8a47df9 100644 --- a/libcelt/os_support.h +++ b/libcelt/os_support.h @@ -42,7 +42,7 @@ #include #include -/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, celt_realloc and celt_free +/** CELT wrapper for calloc(). To do your own dynamic allocation, all you need to do is replace this function, celt_realloc and celt_free NOTE: celt_alloc needs to CLEAR THE MEMORY */ #ifndef OVERRIDE_CELT_ALLOC static inline void *celt_alloc (int size) @@ -54,7 +54,7 @@ static inline void *celt_alloc (int size) } #endif -/** Same as celt_alloc, except that the area is only needed inside a Speex call (might cause problem with wideband though) */ +/** Same as celt_alloc(), except that the area is only needed inside a CELT call (might cause problem with wideband though) */ #ifndef OVERRIDE_CELT_ALLOC_SCRATCH static inline void *celt_alloc_scratch (int size) { @@ -63,7 +63,7 @@ static inline void *celt_alloc_scratch (int size) } #endif -/** Speex wrapper for realloc. To do your own dynamic allocation, all you need to do is replace this function, celt_alloc and celt_free */ +/** CELT wrapper for realloc(). To do your own dynamic allocation, all you need to do is replace this function, celt_alloc and celt_free */ #ifndef OVERRIDE_CELT_REALLOC static inline void *celt_realloc (void *ptr, int size) { @@ -71,7 +71,7 @@ static inline void *celt_realloc (void *ptr, int size) } #endif -/** Speex wrapper for calloc. To do your own dynamic allocation, all you need to do is replace this function, celt_realloc and celt_alloc */ +/** CELT wrapper for free(). To do your own dynamic allocation, all you need to do is replace this function, celt_realloc and celt_alloc */ #ifndef OVERRIDE_CELT_FREE static inline void celt_free (void *ptr) { @@ -79,7 +79,7 @@ static inline void celt_free (void *ptr) } #endif -/** Same as celt_free, except that the area is only needed inside a Speex call (might cause problem with wideband though) */ +/** Same as celt_free(), except that the area is only needed inside a CELT call (might cause problem with wideband though) */ #ifndef OVERRIDE_CELT_FREE_SCRATCH static inline void celt_free_scratch (void *ptr) { -- cgit v1.2.3