Fix whitespace: Convert tabs to spaces and remove trailing whitespace.

This commit is contained in:
binary1248 2015-04-01 04:08:23 +02:00 committed by Lukas Dürrenberger
parent 075d7b3b50
commit e80bf0ba92
54 changed files with 262 additions and 262 deletions

View file

@ -14,23 +14,23 @@ export LDFLAGS=$7
if [ "$1" = "arm" ]
then
ARCH=arm-linux
ANDROID_ABI=armeabi
ARCH=arm-linux
ANDROID_ABI=armeabi
elif [ "$1" = "arm-v7a" ]
then
ARCH=arm-linux
ANDROID_ABI=armeabi-v7a
ARCH=arm-linux
ANDROID_ABI=armeabi-v7a
elif [ "$1" = "x86" ]
then
ARCH=i686-linux
ANDROID_ABI=x86
ARCH=i686-linux
ANDROID_ABI=x86
elif [ "$1" = "mips" ]
then
ARCH=mips-linux
ANDROID_ABI=mips
ARCH=mips-linux
ANDROID_ABI=mips
fi
HOST="--host=$ARCH"

View file

@ -2,43 +2,43 @@
create_toolchain () {
# abort if already created
if [ -d "$PWD/toolchains/$2" ]
then
return
fi
# save the working directory and move to the NDK directory
WORKING_DIRECTORY=$PWD
cd $NDK
# abort if already created
if [ -d "$PWD/toolchains/$2" ]
then
return
fi
# prepare the command according to chosen options
PLATFORM=--platform=android-$1
DIR=--install-dir=$WORKING_DIRECTORY/toolchains/$2
MAKE=$NDK/build/tools/make-standalone-toolchain.sh
# save the working directory and move to the NDK directory
WORKING_DIRECTORY=$PWD
cd $NDK
if [ "$2" = "arm" ]
then
TOOLCHAIN=--toolchain=arm-linux-androideabi-4.8
elif [ "$2" = "x86" ]
then
TOOLCHAIN=--toolchain=x86-4.8
elif [ "$2" = "mips" ]
then
TOOLCHAIN=--toolchain=mipsel-linux-android-4.8
else
echo "Abort."
exit 1
fi
# prepare the command according to chosen options
PLATFORM=--platform=android-$1
DIR=--install-dir=$WORKING_DIRECTORY/toolchains/$2
MAKE=$NDK/build/tools/make-standalone-toolchain.sh
# create the standalone toolchain
$MAKE $PLATFORM $TOOLCHAIN $DIR --stl=libc++
if [ "$2" = "arm" ]
then
TOOLCHAIN=--toolchain=arm-linux-androideabi-4.8
elif [ "$2" = "x86" ]
then
TOOLCHAIN=--toolchain=x86-4.8
elif [ "$2" = "mips" ]
then
TOOLCHAIN=--toolchain=mipsel-linux-android-4.8
else
echo "Abort."
exit 1
fi
# go back to our working directory
cd $WORKING_DIRECTORY
# move linux/soundcard.h to sys/soundcard.h
mv $PWD/toolchains/$2/sysroot/usr/include/linux/soundcard.h $PWD/toolchains/$2/sysroot/usr/include/sys
# create the standalone toolchain
$MAKE $PLATFORM $TOOLCHAIN $DIR --stl=libc++
# go back to our working directory
cd $WORKING_DIRECTORY
# move linux/soundcard.h to sys/soundcard.h
mv $PWD/toolchains/$2/sysroot/usr/include/linux/soundcard.h $PWD/toolchains/$2/sysroot/usr/include/sys
}
create_toolchain 9 arm

View file

@ -22,43 +22,43 @@ mkdir build
wget -nc -P src http://downloads.xiph.org/releases/flac/$FLAC.tar.gz
if [ ! -d "$PWD/tmp/$FLAC" ]
then
tar -C build -xf src/$FLAC.tar.gz
tar -C build -xf src/$FLAC.tar.gz
fi
wget -nc -P src http://downloads.xiph.org/releases/vorbis/$VORBIS.tar.gz
if [ ! -d "$PWD/tmp/$VORBIS" ]
then
tar -C build -xf src/$VORBIS.tar.gz
tar -C build -xf src/$VORBIS.tar.gz
fi
wget -nc -P src http://downloads.xiph.org/releases/ogg/$OGG.tar.gz
if [ ! -d "$PWD/tmp/$OGG" ]
then
tar -C build -xf src/$OGG.tar.gz
tar -C build -xf src/$OGG.tar.gz
fi
wget -nc -P src http://www.mega-nerd.com/libsndfile/files/$SNDFILE.tar.gz
if [ ! -d "$PWD/tmp/$SNDFILE" ]
then
tar -C build -xf src/$SNDFILE.tar.gz
tar -C build -xf src/$SNDFILE.tar.gz
fi
wget -nc -P src http://www.ijg.org/files/jpegsrc.v$JPEG_VERSION.tar.gz
if [ ! -d "$PWD/tmp/$JPEG" ]
then
tar -C build -xf src/jpegsrc.v$JPEG_VERSION.tar.gz
tar -C build -xf src/jpegsrc.v$JPEG_VERSION.tar.gz
fi
wget -nc -P src http://download.savannah.gnu.org/releases/freetype/$FREETYPE.tar.gz
if [ ! -d "$PWD/tmp/$FREETYPE" ]
then
tar -C build -xf src/$FREETYPE.tar.gz
tar -C build -xf src/$FREETYPE.tar.gz
fi
wget -nc -P src https://github.com/AerialX/openal-soft-android/archive/master.tar.gz
if [ ! -d "$PWD/tmp/openal-soft-android-master" ]
then
tar -C build -xf src/master.tar.gz
tar -C build -xf src/master.tar.gz
fi
patch build/openal-soft-android-master/CMakeLists.txt patches/remove-so-version-suffix.diff

View file

@ -3,9 +3,9 @@
# Abort if no known installation of NDK
if [ "$NDK" == "" ]
then
echo "Where is the NDK location ?"
echo -n "NDK: "; read NDK
export NDK=$NDK
echo "Where is the NDK location ?"
echo -n "NDK: "; read NDK
export NDK=$NDK
fi
export ANDROID_NDK=$NDK
@ -13,9 +13,9 @@ export ANDROID_NDK=$NDK
# Abort if we don't know the Android CMake toolchain location
if [ "$ANDROID_CMAKE_TOOLCHAIN" == "" ]
then
echo "Where is the Android CMake toolchain ?"
echo -n "ANDROID_CMAKE_TOOLCHAIN: "; read ANDROID_CMAKE_TOOLCHAIN
export ANDROID_CMAKE_TOOLCHAIN=$ANDROID_CMAKE_TOOLCHAIN
echo "Where is the Android CMake toolchain ?"
echo -n "ANDROID_CMAKE_TOOLCHAIN: "; read ANDROID_CMAKE_TOOLCHAIN
export ANDROID_CMAKE_TOOLCHAIN=$ANDROID_CMAKE_TOOLCHAIN
fi
./clean_all.sh

View file

@ -1,5 +1,5 @@
--- CMakeLists.txt.orig 2013-09-21 15:23:49.305453804 +0200
+++ CMakeLists.txt 2013-09-21 15:24:08.621454210 +0200
--- CMakeLists.txt.orig 2013-09-21 15:23:49.305453804 +0200
+++ CMakeLists.txt 2013-09-21 15:24:08.621454210 +0200
@@ -717,9 +717,7 @@
# Build a library
ADD_LIBRARY(${LIBNAME} ${LIBTYPE} ${OPENAL_OBJS} ${ALC_OBJS})