Commit 842b445e authored by Jean-Marc Valin's avatar Jean-Marc Valin
Browse files

There's nothing, but it now compiles

parent 63590897
......@@ -2,7 +2,7 @@
# Run this to set up the build system: configure, makefiles, etc.
# (based on the version in enlightenment's cvs)
package="ghost"
package="celt"
olddir=`pwd`
srcdir=`dirname $0`
......@@ -20,7 +20,7 @@ echo "checking for autoconf... "
DIE=1
}
VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]\).*/\1/"
VERSIONGREP="sed -e s/.*[^0-9\.]\([0-9]\.[0-9]*\).*/\1/"
VERSIONMKINT="sed -e s/[^0-9]//"
# do we need automake?
......
dnl Process this file with autoconf to produce a configure script. -*-m4-*-
AC_INIT(libghost/ghost.c)
AC_INIT(libcelt/arch.h)
AM_CONFIG_HEADER([config.h])
......@@ -8,7 +8,7 @@ CELT_MAJOR_VERSION=0
CELT_MINOR_VERSION=0
CELT_MICRO_VERSION=0
CELT_EXTRA_VERSION=
CELT_VERSION=$GHOST_MAJOR_VERSION.$GHOST_MINOR_VERSION.$GHOST_MICRO_VERSION$GHOST_EXTRA_VERSION
CELT_VERSION=$CELT_MAJOR_VERSION.$CELT_MINOR_VERSION.$CELT_MICRO_VERSION$CELT_EXTRA_VERSION
CELT_LT_CURRENT=0
CELT_LT_REVISION=0
......@@ -20,7 +20,7 @@ AC_SUBST(CELT_LT_AGE)
# For automake.
VERSION=$CELT_VERSION
PACKAGE=ghost
PACKAGE=celt
AC_SUBST(CELT_VERSION)
......@@ -81,11 +81,11 @@ AC_LIBOBJ(getopt1)])])
AC_CHECK_LIB(winmm, main)
AC_DEFINE_UNQUOTED(CELT_VERSION, "${GHOST_VERSION}", [Complete version string])
AC_DEFINE_UNQUOTED(CELT_MAJOR_VERSION, ${GHOST_MAJOR_VERSION}, [Version major])
AC_DEFINE_UNQUOTED(CELT_MINOR_VERSION, ${GHOST_MINOR_VERSION}, [Version minor])
AC_DEFINE_UNQUOTED(CELT_MICRO_VERSION, ${GHOST_MICRO_VERSION}, [Version micro])
AC_DEFINE_UNQUOTED(CELT_EXTRA_VERSION, "${GHOST_EXTRA_VERSION}", [Version extra])
AC_DEFINE_UNQUOTED(CELT_VERSION, "${CELT_VERSION}", [Complete version string])
AC_DEFINE_UNQUOTED(CELT_MAJOR_VERSION, ${CELT_MAJOR_VERSION}, [Version major])
AC_DEFINE_UNQUOTED(CELT_MINOR_VERSION, ${CELT_MINOR_VERSION}, [Version minor])
AC_DEFINE_UNQUOTED(CELT_MICRO_VERSION, ${CELT_MICRO_VERSION}, [Version micro])
AC_DEFINE_UNQUOTED(CELT_EXTRA_VERSION, "${CELT_EXTRA_VERSION}", [Version extra])
AC_CHECK_SIZEOF(short)
AC_CHECK_SIZEOF(int)
......@@ -121,7 +121,7 @@ fi
AC_SUBST(SIZE16)
AC_SUBST(SIZE32)
AC_OUTPUT([Makefile libghost/Makefile libentcode/Makefile])
AC_OUTPUT([Makefile libcelt/Makefile])
if test "x$src" = "x"; then
echo "**IMPORTANT**"
......
......@@ -13,7 +13,7 @@ libcelt_la_SOURCES = mdct.c
#noinst_HEADERS =
libcelt_la_LDFLAGS = -version-info @GHOST_LT_CURRENT@:@GHOST_LT_REVISION@:@GHOST_LT_AGE@
libcelt_la_LDFLAGS = -version-info @CELT_LT_CURRENT@:@CELT_LT_REVISION@:@CELT_LT_AGE@
noinst_HEADERS = os_support.h arch.h mdct.h
......
......@@ -43,8 +43,10 @@
#include <math.h>
#include "vorbis/codec.h"
#include "mdct.h"
#include "os.h"
#include "misc.h"
/*#include "os.h"*/
/*#include "misc.h"*/
#define STIN static inline
/* build lookups for trig functions; also pre-figure scaling and
some window function algebra. */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment