From 4f3afa5081dbeb2d5a4623289af6fdf665252e8f Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Fri, 27 Aug 2010 15:47:16 +0300
Subject: [PATCH] Fixed dependencies rebuilding in ChangeAppSettings.sh

---
 ChangeAppSettings.sh                        | 14 +++++++-------
 project/AndroidManifest.xml                 |  4 ++--
 project/jni/application/sc2/AppSettings.cfg |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh
index e0e8257fe..8ef2734cd 100755
--- a/ChangeAppSettings.sh
+++ b/ChangeAppSettings.sh
@@ -349,18 +349,18 @@ mv -f project/res/values/strings.xml.1 project/res/values/strings.xml
 
 echo Forcing rebuild of specific files
 rm -rf project/libs/*
-	rm -rf project/bin/ndk/local/*/objs/sdl_main/* project/bin/ndk/local/*/libsdl_main.so
+rm -rf project/bin/ndk/local/*/objs/sdl_main/* project/bin/ndk/local/*/libsdl_main.so
+rm -rf project/bin/ndk/local/*/libsdl.so
+rm -rf project/bin/ndk/local/*/objs/sdl/src/audio/android
+rm -rf project/bin/ndk/local/*/objs/sdl/src/video/android/*.o
+rm -rf project/bin/ndk/local/*/objs/sdl/src/video/SDL_video.o
+rm -rf project/bin/ndk/local/*/objs/sdl/SDL_renderer_gles.o
 if [ "$LibSdlVersionOld" '!=' "$LibSdlVersion" ]; then
 	# Internal types are different in SDL 1.2 and 1.3, namely SDL_Rect, so all libs using it have to be recompiled
-	rm -rf project/bin/ndk/local/*/objs/sdl* project/bin/ndk/local/*/libsdl*.so
+	rm -rf project/bin/ndk/local/*/objs/sdl*
 	rm -rf project/bin/ndk/local/*/objs/application project/bin/ndk/local/*/libapplication.so
 fi
 # Do not rebuild libraries that do not need that
 find project/bin/ndk/local -name "*.[oa]" -exec touch '{}' \;
-# Force rebuild of C-Java bindings and updated settings
-touch project/sdl/sdl-*/src/audio/android/*.c
-touch project/sdl/sdl-*/src/video/android/*.c
-touch project/sdl/sdl-*/src/video/SDL_video.c
-touch project/sdl/sdl-1.3/src/video/SDL_renderer_gles.c
 
 echo Done
diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml
index 652a7cc33..088f019a9 100644
--- a/project/AndroidManifest.xml
+++ b/project/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
       package="com.sourceforge.sc2"
-      android:versionCode="1004"
-      android:versionName="1.0.04"
+      android:versionCode="1005"
+      android:versionName="1.0.05"
       android:installLocation="preferExternal"
 >
     <application android:label="@string/app_name" 
diff --git a/project/jni/application/sc2/AppSettings.cfg b/project/jni/application/sc2/AppSettings.cfg
index e3d7f9114..f6d509216 100644
--- a/project/jni/application/sc2/AppSettings.cfg
+++ b/project/jni/application/sc2/AppSettings.cfg
@@ -14,8 +14,8 @@ RedefinedKeys="RETURN RSHIFT KP_PLUS KP_MINUS ESCAPE F10"
 AppTouchscreenKeyboardKeysAmount=2
 AppTouchscreenKeyboardKeysAmountAutoFire=2
 MultiABI=n
-AppVersionCode=1004
-AppVersionName="1.0.04"
+AppVersionCode=1005
+AppVersionName="1.0.05"
 CompiledLibraries="sdl_image"
 AppCflags='-O0 -DTHREADLIB_SDL=1 -DTIMELIB=SDL -DOVCODEC_TREMOR=1 -DNETPLAY=1 -DHAVE_REGEX=1 -DHAVE_GETOPT_LONG=1 -DHAVE_ZIP=1'
 AppLdflags='-Lbin/ndk/local/armeabi -ltremor'