miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated basiliskii config and script

Browse Source
This commit is contained in:
lubomyr
2016-08-27 18:35:10 +03:00
parent 259e903581
commit a5b0f6440b
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
project/jni/application/basiliskii/AndroidAppSettings.cfg
View File

@@ -72,6 +72,7 @@ CompatibilityHacksStaticInit=n
# On-screen Android soft text input emulates hardware keyboard, this will only work with Hackers Keyboard app (y)/(n)
CompatibilityHacksTextInputEmulatesHwKeyboard=y
TextInputKeyboard=1
# Hack for broken devices: prevent audio chopping, by sleeping a bit after pushing each audio chunk (y)/(n)
CompatibilityHacksPreventAudioChopping=n
@@ -103,7 +104,7 @@ AppNeedsTwoButtonMouse=y
ShowMouseCursor=n
# Generate more touch events, by default SDL generates one event per one video frame, this is useful for drawing apps (y) or (n)
GenerateSubframeTouchEvents=
GenerateSubframeTouchEvents=y
# Force relative (laptop) mouse movement mode, useful when both on-screen keyboard and mouse are needed (y) or (n)
ForceRelativeMouseMode=y
@@ -170,7 +171,7 @@ RedefinedKeysScreenKbNames="RCTRL SPACE F12"
# 1 = Simple Theme by Beholder (white, with gamepad joystick)
# 2 = Sun by Sirea (yellow, with round joystick)
# 3 = Keen by Gerstrong (multicolor, with round joystick)
TouchscreenKeysTheme=2
TouchscreenKeysTheme=1
# Redefine gamepad keys to SDL keysyms, button order is:
# A B X Y L1 R1 L2 R2 LThumb RThumb

20
project/jni/application/basiliskii/AndroidBuild.sh
View File

@@ -4,21 +4,21 @@
LOCAL_PATH=`dirname $0`
LOCAL_PATH=`cd $LOCAL_PATH && pwd`
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi-v7a/libSDL.so
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi-v7a/libpthread.so
ln -sf libsdl_image.so $LOCAL_PATH/../../../obj/local/armeabi-v7a/libSDL_image.so
ln -sf libsdl_ttf.so $LOCAL_PATH/../../../obj/local/armeabi-v7a/libSDL_ttf.so
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/$1/libSDL.so
ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/$1/libpthread.so
ln -sf libsdl_image.so $LOCAL_PATH/../../../obj/local/$1/libSDL_image.so
ln -sf libsdl_ttf.so $LOCAL_PATH/../../../obj/local/$1/libSDL_ttf.so
if [ "$1" = armeabi-v7a ]; then
if [ \! -f basiliskii/src/Unix/configure ] ; then
sh -c "cd basiliskii/src/Unix && ./autogen.sh"
fi
if [ \! -f basiliskii/src/Unix/Makefile ] ; then
env CFLAGS="-Ofast -funsafe-math-optimizations -ffast-math -marm" \
env CXXFLAGS="-marm" \
../setEnvironment-armeabi-v7a.sh sh -c "cd basiliskii/src/Unix && ./configure --build=x86_64-unknown-linux-gnu --host=arm-linux-androideabi --enable-sdl-video --enable-sdl-audio --without-gtk --without-esd --without-x"
env CFLAGS="-Ofast" \
env LIBS="-lgnustl_static" \
../setEnvironment-$1.sh sh -c "cd basiliskii/src/Unix && ./configure --build=x86_64-unknown-linux-gnu --host=$2 --enable-sdl-video --enable-sdl-audio --without-gtk --without-esd --without-x"
fi
make -C basiliskii/src/Unix && mv -f basiliskii/src/Unix/BasiliskII libapplication-armeabi-v7a.so
fi
make -C basiliskii/src/Unix && mv -f basiliskii/src/Unix/BasiliskII libapplication-$1.so