fix tremor compilation / ogg path / remove xiph fallback

This commit is contained in:
Mathieu Virbel 2012-04-22 14:40:40 +02:00
parent 94fb07f16e
commit 9a4448c35c
2 changed files with 25 additions and 3 deletions

View file

@ -0,0 +1,18 @@
--- configure.in (revision 18244)
+++ configure.in (working copy)
@@ -116,15 +116,6 @@
then
PKG_CHECK_MODULES(OGG, ogg >= 1.0, HAVE_OGG=yes, HAVE_OGG=no)
fi
-if test "x$HAVE_OGG" = "xno"
-then
- dnl fall back to the old school test
- XIPH_PATH_OGG(, AC_MSG_ERROR(must have Ogg installed!))
- libs_save=$LIBS
- LIBS="$OGG_LIBS"
- AC_CHECK_FUNC(oggpack_writealign, , AC_MSG_ERROR(Ogg >= 1.0 required !))
- LIBS=$libs_save
-fi
dnl --------------------------------------------------
dnl Check for library functions

View file

@ -15,7 +15,9 @@ if [ ! -d libtremor ]; then
try mkdir libtremor
try cd libtremor
try svn co http://svn.xiph.org/trunk/Tremor tremor
try cd ..
try cd tremor
try patch -p0 < $KIVYIOSROOT/src/tremor-configure.patch
try cd ../..
fi
if [ ! -d libogg ]; then
try curl -L http://downloads.xiph.org/releases/ogg/libogg-1.3.0.tar.gz > $CACHEROOT/libogg-1.3.0.tar.gz
@ -40,12 +42,14 @@ if [ ! -f libtremor/tremor/.libs/libvorbisidec.a ]; then
echo > asm_arm.h
CC="$ARM_CC" AR="$ARM_AR" \
LDFLAGS="$ARM_LDFLAGS" CFLAGS="$ARM_CFLAGS" \
OGG_CFLAGS="-I../../libogg/include" \
OGG_LDFLAGS="-L../../libogg/src/.libs" \
PKG_CONFIG_LIBDIR="../../libogg" \
ACLOCAL_FLAGS="-I /usr/local/share/aclocal" ./autogen.sh \
--disable-shared \
--host=arm-apple-darwin \
--enable-static=yes \
--enable-shared=no \
--with-ogg-includes=../../libogg/include
--enable-shared=no
try make
try cd ../..
fi