Merge branch 'sdl_android' of github.com:pelya/commandergenius into android

This commit is contained in:
pelya
2012-08-03 16:38:50 +03:00
3 changed files with 3 additions and 2 deletions

View File

@@ -38,6 +38,7 @@ cd project && env PATH=$NDKBUILDPATH nice -n19 ndk-build V=1 -j$NCPU && \
`which ndk-build | sed 's@/ndk-build@@'`/toolchains/arm-linux-androideabi-4.4.3/prebuilt/$MYARCH/bin/arm-linux-androideabi-strip --strip-unneeded libs/armeabi/libapplication.so \
|| true ; } && \
ant debug && \
[ -n "`adb devices | tail -n +2`" ] && \
test -z "$1" && cd bin && \
{ adb install -r MainActivity-debug.apk | grep 'Failure' && \
adb uninstall `grep AppFullName ../../AndroidAppSettings.cfg | sed 's/.*=//'` && adb install -r MainActivity-debug.apk ; true ; } && \

View File

@@ -10,7 +10,7 @@ VideoDepthBpp=24
NeedDepthBuffer=n
NeedStencilBuffer=n
NeedGles2=n
SwVideoMode=y
SwVideoMode=n
SdlVideoResize=y
SdlVideoResizeKeepAspect=n
CompatibilityHacks=n