Updated UQM and readme

project/jni/Android.mk

@@ -1,6 +1,6 @@
 
 # The namespace in Java file, with dots replaced with underscores
-SDL_JAVA_PACKAGE_PATH := com_googlecode_opentyrian
+SDL_JAVA_PACKAGE_PATH := com_sourceforge_sc2
 
 # Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here
 # SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := com_googlecode_opentyrian
 # Typically /sdcard/alienblaster 
 # Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder
 # Your application will just set current directory there
-SDL_CURDIR_PATH := com.googlecode.opentyrian
+SDL_CURDIR_PATH := com.sourceforge.sc2
 
 # Android Dev Phone G1 has trackball instead of cursor keys, and 
 # sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -23,17 +23,17 @@ SDL_TRACKBALL_KEYUP_DELAY := 1
 # resized in HW-accelerated way, however it eats a tiny bit of CPU
 SDL_VIDEO_RENDER_RESIZE := 1
 
-COMPILED_LIBRARIES := sdl_net
+COMPILED_LIBRARIES := sdl_image
 
-APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
+APPLICATION_ADDITIONAL_CFLAGS := -O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1
 
-APPLICATION_ADDITIONAL_LDFLAGS := 
+APPLICATION_ADDITIONAL_LDFLAGS := -Lobj/local/armeabi -ltremor
 
 APPLICATION_SUBDIRS_BUILD := 
 
 APPLICATION_CUSTOM_BUILD_SCRIPT := 
 
-SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LCTRL -DSDL_ANDROID_KEYCODE_3=LALT -DSDL_ANDROID_KEYCODE_4=SPACE
+SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=RETURN -DSDL_ANDROID_KEYCODE_1=RSHIFT -DSDL_ANDROID_KEYCODE_2=KP_PLUS -DSDL_ANDROID_KEYCODE_3=KP_MINUS -DSDL_ANDROID_KEYCODE_4=ESCAPE -DSDL_ANDROID_KEYCODE_5=F10
 
 # If SDL_Mixer should link to libMAD
 SDL_MIXER_USE_LIBMAD :=

project/jni/Application.mk

@@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/..
 # sdl_image depends on png and jpeg
 # sdl_ttf depends on freetype
 
-APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_net
+APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_image
 
 APP_ABI := armeabi

project/jni/application/sc2/AndroidAppSettings.cfg

@@ -15,8 +15,8 @@ RedefinedKeys="RETURN RSHIFT KP_PLUS KP_MINUS ESCAPE F10"
 AppTouchscreenKeyboardKeysAmount=2
 AppTouchscreenKeyboardKeysAmountAutoFire=2
 MultiABI=n
-AppVersionCode=1010
-AppVersionName="1.0.10 - fixed overwriting savegames, added support for 3DO videos (you should copy them from your 3DO game CD)"
+AppVersionCode=1011
+AppVersionName="1.0.11 - game can be put to background with Home button and successfully restored back"
 CompiledLibraries="sdl_image"
 CustomBuildScript=n
 AppCflags='-O2 -finline-functions -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1'

project/jni/application/sc2/src/libs/graphics/sdl/sdl_common.c

@@ -52,6 +52,25 @@ TFB_GRAPHICS_BACKEND *graphics_backend = NULL;
 volatile int QuitPosted = 0;
 volatile int GameActive = 1; // Track the SDL_ACTIVEEVENT state SDL_APPACTIVE
 
+#ifdef ANDROID
+extern void ResumeMusic (void);
+extern void PauseMusic (void);
+
+void AndroidGamePaused()
+{
+	GameActive = 0;
+	SDL_ANDROID_PauseAudioPlayback();
+	PauseMusic();
+}
+
+void AndroidGameResumed()
+{
+	GameActive = 1;
+	SDL_ANDROID_ResumeAudioPlayback();
+	ResumeMusic();
+}
+#endif
+
 void
 TFB_PreInit (void)
 {
@@ -76,6 +95,9 @@ TFB_PreInit (void)
 		log_add (log_Fatal, "Could not initialize SDL: %s.", SDL_GetError ());
 		exit (EXIT_FAILURE);
 	}
+#ifdef ANDROID
+	SDL_ANDROID_SetApplicationPutToBackgroundCallback(&AndroidGamePaused, &AndroidGameResumed);
+#endif
 }
 
 int

project/jni/application/src

@@ -1 +1 @@
-opentyrian
+sc2