From 36d27030ddd6d8ad13b0ce64dcc23209c01d36a6 Mon Sep 17 00:00:00 2001 From: doug <linderd@iinet.net.au> Date: Sat, 12 Oct 2013 20:47:35 +0800 Subject: [PATCH 1/2] Fixed PIL build flags and Tremor import path --- tools/build-pil.sh | 2 +- tools/build-sdlmixer.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-pil.sh b/tools/build-pil.sh index f60e6a9..89719f4 100755 --- a/tools/build-pil.sh +++ b/tools/build-pil.sh @@ -17,7 +17,7 @@ OLD_CC="$CC" OLD_CFLAGS="$CFLAGS" OLD_LDFLAGS="$LDFLAGS" OLD_LDSHARED="$LDSHARED" -export CC="$ARM_CC -I$BUILDROOT/include" +export CC="$ARM_CC -I$BUILDROOT/include -I$BUILDROOT/include/freetype" export CFLAGS="$ARM_CFLAGS" export LDFLAGS="$ARM_LDFLAGS" export LDSHARED="$KIVYIOSROOT/tools/liblink" diff --git a/tools/build-sdlmixer.sh b/tools/build-sdlmixer.sh index b42613f..8942ba0 100755 --- a/tools/build-sdlmixer.sh +++ b/tools/build-sdlmixer.sh @@ -14,7 +14,7 @@ fi if [ ! -d libtremor ]; then try mkdir libtremor try cd libtremor - try svn co http://svn.xiph.org/trunk/Tremor tremor + try svn co https://svn.xiph.org/trunk/Tremor tremor try cd tremor try patch -p0 < $KIVYIOSROOT/src/tremor-configure.patch try cd ../.. From 45aee82636cbee33deef38423e256b5a4a199e70 Mon Sep 17 00:00:00 2001 From: doug <linderd@iinet.net.au> Date: Wed, 16 Oct 2013 09:21:03 +0800 Subject: [PATCH 2/2] libtremor download is now more robust on failure --- tools/build-sdlmixer.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/build-sdlmixer.sh b/tools/build-sdlmixer.sh index 8942ba0..bd884e0 100755 --- a/tools/build-sdlmixer.sh +++ b/tools/build-sdlmixer.sh @@ -11,8 +11,8 @@ fi if [ ! -d SDL_mixer ]; then try hg clone http://hg.libsdl.org/SDL_mixer/#SDL-1.2 fi -if [ ! -d libtremor ]; then - try mkdir libtremor +if [ ! -d libtremor/tremor ]; then + try mkdir -p libtremor try cd libtremor try svn co https://svn.xiph.org/trunk/Tremor tremor try cd tremor