diff --git a/project/jni/application/basiliskii/AndroidAppSettings.cfg b/project/jni/application/basiliskii/AndroidAppSettings.cfg index 197fee1fc..fc4017b6e 100644 --- a/project/jni/application/basiliskii/AndroidAppSettings.cfg +++ b/project/jni/application/basiliskii/AndroidAppSettings.cfg @@ -7,10 +7,10 @@ AppName="BasiliskII" AppFullName=net.cebix.basilisk # Application version code (integer) -AppVersionCode=10004 +AppVersionCode=10005 # Application user-visible version name (string) -AppVersionName="1.0.0.04" +AppVersionName="1.0.0.05" # Specify path to download application data in zip archive in the form 'Description|URL|MirrorURL^Description2|URL2|MirrorURL2^...' # If you'll start Description with '!' symbol it will be enabled by default, other downloads should be selected by user from startup config menu @@ -236,3 +236,6 @@ AdmobTestDeviceId= # Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER) AdmobBannerSize= +# Hide Android system mouse cursor image when USB mouse is attached (y) or (n) - the app must draw it's own mouse cursor +HideSystemMousePointer=y + diff --git a/project/jni/application/basiliskii/AndroidBuild.sh b/project/jni/application/basiliskii/AndroidBuild.sh index 730e8b1a8..873486044 100755 --- a/project/jni/application/basiliskii/AndroidBuild.sh +++ b/project/jni/application/basiliskii/AndroidBuild.sh @@ -9,6 +9,7 @@ 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 +JOBS=4 if [ \! -f basiliskii/src/Unix/configure ] ; then sh -c "cd basiliskii/src/Unix && ./autogen.sh" @@ -20,5 +21,5 @@ if [ \! -f basiliskii/src/Unix/Makefile ] ; then ../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-$1.so +make -C basiliskii/src/Unix -j$JOBS && mv -f basiliskii/src/Unix/BasiliskII libapplication-$1.so diff --git a/project/jni/application/basiliskii/AndroidData/cfg.zip b/project/jni/application/basiliskii/AndroidData/cfg.zip old mode 100644 new mode 100755 index 7e8e93d75..efa0a47f6 Binary files a/project/jni/application/basiliskii/AndroidData/cfg.zip and b/project/jni/application/basiliskii/AndroidData/cfg.zip differ diff --git a/project/jni/application/basiliskii/AndroidData/guichan-gui.zip b/project/jni/application/basiliskii/AndroidData/guichan-gui.zip old mode 100644 new mode 100755 index b010ceb4c..ede907726 Binary files a/project/jni/application/basiliskii/AndroidData/guichan-gui.zip and b/project/jni/application/basiliskii/AndroidData/guichan-gui.zip differ diff --git a/project/jni/application/basiliskii/icon.png b/project/jni/application/basiliskii/icon.png index e361560e6..1e0948425 100644 Binary files a/project/jni/application/basiliskii/icon.png and b/project/jni/application/basiliskii/icon.png differ