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

Fixed dependencies rebuilding in ChangeAppSettings.sh

Browse Source
This commit is contained in:
pelya
2010-08-27 15:47:16 +03:00
parent 6bd7d4126f
commit 4f3afa5081
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeAppSettings.sh
View File

@@ -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

4
project/AndroidManifest.xml
View File

@@ -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"

4
project/jni/application/sc2/AppSettings.cfg
View File

@@ -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'