Updated PrefClub project

project/jni/application/prefclub/AndroidAppSettings.cfg

@@ -5,7 +5,7 @@ AppName="PrefClub"
 AppFullName=org.prefclub
 ScreenOrientation=h
 InhibitSuspend=n
-AppDataDownloadUrl="!Prefclub game|prefclub.zip"
+AppDataDownloadUrl="!Prefclub game|prefclub2.zip"
 VideoDepthBpp=16
 NeedDepthBuffer=n
 NeedStencilBuffer=n
@@ -14,13 +14,17 @@ SwVideoMode=y
 SdlVideoResize=y
 SdlVideoResizeKeepAspect=n
 CompatibilityHacks=n
+CompatibilityHacksStaticInit=n
+CompatibilityHacksTextInputEmulatesHwKeyboard=n
+CompatibilityHacksPreventAudioChopping=n
 AppUsesMouse=n
 AppNeedsTwoButtonMouse=n
+ShowMouseCursor=n
 ForceRelativeMouseMode=n
 AppNeedsArrowKeys=y
 AppNeedsTextInput=y
 AppUsesJoystick=n
-AppHandlesJoystickSensitivity=n
+AppUsesAccelerometer=n
 AppUsesMultitouch=n
 NonBlockingSwapBuffers=n
 RedefinedKeys="SPACE RETURN NO_REMAP NO_REMAP RETURN ESCAPE F5 F6 F7 F8"
@@ -29,10 +33,13 @@ AppTouchscreenKeyboardKeysAmountAutoFire=0
 RedefinedKeysScreenKb="RETURN LSHIFT LCTRL LALT"
 StartupMenuButtonTimeout=3000
 HiddenMenuOptions='OptionalDownloadConfig'
-FirstStartMenuOptions=''
+FirstStartMenuOptions='new Settings.ShowReadme()'
 MultiABI=n
-AppVersionCode=07404
-AppVersionName="0.74.04"
+AppMinimumRAM=0
+AppVersionCode=07405
+AppVersionName="0.74.05"
+ResetSdlConfigForThisVersion=y
+DeleteFilesOnUpgrade="prefclub"
 CompiledLibraries="jpeg png sdl_mixer sdl_net sdl_sound"
 CustomBuildScript=y
 AppCflags=''
@@ -40,3 +47,7 @@ AppLdflags=''
 AppSubdirsBuild=''
 AppCmdline=''
 ReadmeText='^You may press "Home" now - the data will be downloaded in background'
+MinimumScreenSize=s
+AdmobPublisherId=n
+AdmobTestDeviceId=
+AdmobBannerSize=

project/jni/application/prefclub/AndroidBuild.sh

@@ -8,12 +8,18 @@ ln -sf libsdl-1.2.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL.so
 ln -sf libsdl_net.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_net.so
 ln -sf libsdl_sound.so $LOCAL_PATH/../../../obj/local/armeabi/libSDL_sound.so
 
+if [ \! -d dosbox-0.74 ] ; then
+	wget http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz && tar xvf dosbox-0.74.tar.gz && patch -p0 < dosbox-0.74-androidSDL.diff || exit 1
+fi
+
 if [ \! -f dosbox-0.74/configure ] ; then
-	sh -c "cd dosbox-0.74 && ./autogen.sh"
+	sh -c "cd dosbox-0.74 && ./autogen.sh" || exit 1
 fi
 
 if [ \! -f dosbox-0.74/Makefile ] ; then
-	../setEnvironment.sh sh -c "cd dosbox-0.74 && ./configure --build=x86_64-unknown-linux-gnu --host=arm-eabi"
+	env CFLAGS="-frtti -fexceptions" LDFLAGS="-frtti -fexceptions" \
+	../setEnvironment.sh sh -c "cd dosbox-0.74 && ./configure --build=x86_64-unknown-linux-gnu --host=arm-linux-androideabi" || exit 1
 fi
 
-../setEnvironment.sh sh -c "cd dosbox-0.74 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -lpng -lgcc -lz -lc -lstdc++'" && cp -f dosbox-0.74/src/dosbox libapplication.so
+../setEnvironment.sh sh -c "cd dosbox-0.74 && make -j4 VERBOSE=1 STRIP='' LIBS='-lsdl-1.2 -lpng -lgcc -lz -lc -lgnustl_static -lsupc++'" && cp -f dosbox-0.74/src/dosbox libapplication.so || exit 1
+exit 0

project/jni/application/prefclub/build_instructions.txt

@@ -1,12 +0,0 @@
-Build instructions
-
-unpack dosbox-0.74-cfg-pelyaSDL.tar.gz into ~/commandergenius/project/jni/application
-Download http://sourceforge.net/projects/dosbox/files/dosbox/0.74/dosbox-0.74.tar.gz/download
-unpack dosbox-0.74.tar.gz into ~/commandergenius/project/jni/application/dosbox
-apply patch dosbox-0.74-androidSDL.diff
-
-cd ~/commandergenius/project/jni/application
-rm src
-ln -s dosbox src
-cd ~/commandergenius
-./build.sh