Merge branch 'master' of git://github.com/splanquart/kivy-ios

Conflicts:
	build_kivy.sh
	build_python.sh
	build_sdl.sh
	environment.sh
This commit is contained in:
Mathieu Virbel 2011-12-06 18:06:14 +01:00
commit 0977b6325a
2 changed files with 2 additions and 2 deletions

View file

@ -1,6 +1,6 @@
#!/bin/bash
. ./environment.sh
. environment.sh
if [ ! -d kivy ] ; then
try git clone https://github.com/tito/kivy

View file

@ -1,7 +1,7 @@
#!/bin/bash
. ./environment.sh
pushd sdl/sdl1.3/Xcode-iPhoneOS/SDL
xcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL
xcodebuild -project SDLiPhoneOS.xcodeproj -target libSDL -configuration Debug -sdk iphoneos5.0
popd
cp sdl/sdl1.3/Xcode-iPhoneOS/SDL/build/Release-iPhoneOS/libSDL.a $BUILDROOT/lib