mirror of
https://github.com/love2d/love-android.git
synced 2026-08-17 19:24:07 +02:00
updated to latest SDL2 (f9244b2a151)
This commit is contained in:
@@ -61,13 +61,13 @@ mkdir checker-buildbot
|
||||
cd checker-buildbot
|
||||
|
||||
# You might want to do this for CMake-backed builds instead...
|
||||
#cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER="$CHECKERDIR/libexec/ccc-analyzer" ..
|
||||
PATH="$CHECKERDIR:$PATH" scan-build -o analysis cmake -DCMAKE_BUILD_TYPE=Debug ..
|
||||
|
||||
# ...or run configure without the scan-build wrapper...
|
||||
#CC="$CHECKERDIR/libexec/ccc-analyzer" CFLAGS="-O0" ../configure
|
||||
|
||||
# ...but this works for our buildbots just fine.
|
||||
CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure
|
||||
# ...but this works for our buildbots just fine (EXCEPT ON LATEST MAC OS X).
|
||||
#CFLAGS="-O0" PATH="$CHECKERDIR:$PATH" scan-build -o analysis ../configure
|
||||
|
||||
rm -rf analysis
|
||||
PATH="$CHECKERDIR:$PATH" scan-build -o analysis $MAKE
|
||||
|
||||
+27
@@ -359,6 +359,19 @@ case $basic_machine in
|
||||
i*86 | x86_64)
|
||||
basic_machine=$basic_machine-pc
|
||||
;;
|
||||
nacl64*)
|
||||
basic_machine=x86_64-pc
|
||||
os=-nacl
|
||||
;;
|
||||
nacl*)
|
||||
basic_machine=i686-pc
|
||||
os=-nacl
|
||||
;;
|
||||
pnacl*)
|
||||
# le32-unknown-pnacl comes from http://www.chromium.org/nativeclient/pnacl/stability-of-the-pnacl-bitcode-abi
|
||||
basic_machine=le32-unknown
|
||||
os=-pnacl
|
||||
;;
|
||||
# Object if more than one company name word.
|
||||
*-*-*)
|
||||
echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
|
||||
@@ -843,6 +856,10 @@ case $basic_machine in
|
||||
basic_machine=le32-unknown
|
||||
os=-nacl
|
||||
;;
|
||||
pnacl)
|
||||
basic_machine=le32-unknown
|
||||
os=-pnacl
|
||||
;;
|
||||
ncr3000)
|
||||
basic_machine=i486-ncr
|
||||
os=-sysv4
|
||||
@@ -1384,6 +1401,12 @@ case $os in
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
-nacl*)
|
||||
os=-nacl
|
||||
;;
|
||||
-pnacl*)
|
||||
os=-pnacl
|
||||
;;
|
||||
-nto-qnx*)
|
||||
;;
|
||||
-nto*)
|
||||
@@ -1506,6 +1529,10 @@ case $os in
|
||||
os=-dicos
|
||||
;;
|
||||
-nacl*)
|
||||
os=-nacl
|
||||
;;
|
||||
-pnacl*)
|
||||
os=-pnacl
|
||||
;;
|
||||
-none)
|
||||
;;
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
|
||||
TARBALL="$1"
|
||||
if [ -z $1 ]; then
|
||||
TARBALL=sdl-raspberrypi.tar.bz2
|
||||
TARBALL=sdl-raspberrypi.tar.xz
|
||||
fi
|
||||
|
||||
OSTYPE=`uname -s`
|
||||
@@ -42,7 +42,7 @@ SYSROOT="/opt/rpi-sysroot"
|
||||
export CC="ccache /opt/rpi-tools/arm-bcm2708/gcc-linaro-arm-linux-gnueabihf-raspbian/bin/arm-linux-gnueabihf-gcc --sysroot=$SYSROOT -I$SYSROOT/opt/vc/include -I$SYSROOT/usr/include -I$SYSROOT/opt/vc/include/interface/vcos/pthreads -I$SYSROOT/opt/vc/include/interface/vmcs_host/linux -L$SYSROOT/opt/vc/lib"
|
||||
# -L$SYSROOT/usr/lib/arm-linux-gnueabihf"
|
||||
# !!! FIXME: shouldn't have to --disable-* things here.
|
||||
../configure --with-sysroot=$SYSROOT --host=arm-raspberry-linux-gnueabihf --prefix=$PWD/rpi-sdl2-installed --disable-pulseaudio --disable-esd --disable-video-mir
|
||||
../configure --with-sysroot=$SYSROOT --host=arm-raspberry-linux-gnueabihf --prefix=$PWD/rpi-sdl2-installed --disable-pulseaudio --disable-esd --disable-video-mir --disable-video-wayland
|
||||
$MAKE
|
||||
$MAKE install
|
||||
# Fix up a few things to a real install path on a real Raspberry Pi...
|
||||
@@ -51,7 +51,7 @@ mkdir -p ./usr
|
||||
mv ./rpi-sdl2-installed ./usr/local
|
||||
|
||||
popd
|
||||
tar -cjvvf $TARBALL -C $BUILDBOTDIR usr
|
||||
tar -cJvvf $TARBALL -C $BUILDBOTDIR usr
|
||||
rm -rf $BUILDBOTDIR
|
||||
|
||||
set +x
|
||||
|
||||
Reference in New Issue
Block a user