From 62a82ec84d1556d99c795ce5cc84fd5b58f3c0f6 Mon Sep 17 00:00:00 2001 From: pelya Date: Fri, 10 Sep 2010 14:11:20 +0300 Subject: [PATCH] Renamed AppSettings to AndroidAppSettings everywhere, added symlink to CommanderGenius repo --- AndroidAppSettings.cfg | 1 + AppSettings.cfg | 1 - ChangeAppSettings.sh | 49 ++++++++++--------- project/AndroidManifest.xml | 6 +-- project/jni/Android.mk | 14 +++--- project/jni/Application.mk | 4 +- ...AppSettings.cfg => AndroidAppSettings.cfg} | 0 project/jni/application/commandergenius | 1 + ...AppSettings.cfg => AndroidAppSettings.cfg} | 0 ...AppSettings.cfg => AndroidAppSettings.cfg} | 0 ...AppSettings.cfg => AndroidAppSettings.cfg} | 0 project/jni/application/src | 2 +- ...AppSettings.cfg => AndroidAppSettings.cfg} | 0 project/res/values/strings.xml | 2 +- project/src/Accelerometer.java | 2 +- project/src/Audio.java | 2 +- project/src/DataDownloader.java | 2 +- project/src/GLSurfaceView_SDL.java | 2 +- project/src/Globals.java | 14 +++--- project/src/MainActivity.java | 2 +- project/src/Settings.java | 2 +- project/src/Video.java | 2 +- 22 files changed, 55 insertions(+), 53 deletions(-) create mode 120000 AndroidAppSettings.cfg delete mode 120000 AppSettings.cfg rename project/jni/application/alienblaster/{AppSettings.cfg => AndroidAppSettings.cfg} (100%) create mode 120000 project/jni/application/commandergenius rename project/jni/application/jooleem_0.1.4/{AppSettings.cfg => AndroidAppSettings.cfg} (100%) rename project/jni/application/opentyrian/{AppSettings.cfg => AndroidAppSettings.cfg} (100%) rename project/jni/application/sc2/{AppSettings.cfg => AndroidAppSettings.cfg} (100%) rename project/jni/application/teeworlds/{AppSettings.cfg => AndroidAppSettings.cfg} (100%) diff --git a/AndroidAppSettings.cfg b/AndroidAppSettings.cfg new file mode 120000 index 000000000..5a5d521d5 --- /dev/null +++ b/AndroidAppSettings.cfg @@ -0,0 +1 @@ +project/jni/application/src/AndroidAppSettings.cfg \ No newline at end of file diff --git a/AppSettings.cfg b/AppSettings.cfg deleted file mode 120000 index 2ebde70c3..000000000 --- a/AppSettings.cfg +++ /dev/null @@ -1 +0,0 @@ -project/jni/application/src/AppSettings.cfg \ No newline at end of file diff --git a/ChangeAppSettings.sh b/ChangeAppSettings.sh index 589e8612e..23d8613b4 100755 --- a/ChangeAppSettings.sh +++ b/ChangeAppSettings.sh @@ -7,7 +7,7 @@ if [ "X$1" = "X-a" ]; then AUTO=1 fi -. ./AppSettings.cfg +. ./AndroidAppSettings.cfg if [ "$CHANGE_APP_SETTINGS_VERSION" != "$AppSettingVersion" ]; then AUTO= @@ -185,29 +185,30 @@ fi # AUTO echo -cat /dev/null > AppSettings.cfg -echo AppSettingVersion=$CHANGE_APP_SETTINGS_VERSION >> AppSettings.cfg -echo LibSdlVersion=$LibSdlVersion >> AppSettings.cfg -echo AppName=\"$AppName\" >> AppSettings.cfg -echo AppFullName=$AppFullName >> AppSettings.cfg -echo ScreenOrientation=$ScreenOrientation >> AppSettings.cfg -echo AppDataDownloadUrl=\"$AppDataDownloadUrl\" >> AppSettings.cfg -echo SdlVideoResize=$SdlVideoResize >> AppSettings.cfg -echo NeedDepthBuffer=$NeedDepthBuffer >> AppSettings.cfg -echo AppUsesMouse=$AppUsesMouse >> AppSettings.cfg -echo AppNeedsArrowKeys=$AppNeedsArrowKeys >> AppSettings.cfg -echo AppUsesJoystick=$AppUsesJoystick >> AppSettings.cfg -echo AppUsesMultitouch=$AppUsesMultitouch >> AppSettings.cfg -echo RedefinedKeys=\"$RedefinedKeys\" >> AppSettings.cfg -echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AppSettings.cfg -echo AppTouchscreenKeyboardKeysAmountAutoFire=$AppTouchscreenKeyboardKeysAmountAutoFire >> AppSettings.cfg -echo MultiABI=$MultiABI >> AppSettings.cfg -echo AppVersionCode=$AppVersionCode >> AppSettings.cfg -echo AppVersionName=\"$AppVersionName\" >> AppSettings.cfg -echo CompiledLibraries=\"$CompiledLibraries\" >> AppSettings.cfg -echo AppCflags=\'$AppCflags\' >> AppSettings.cfg -echo AppLdflags=\'$AppLdflags\' >> AppSettings.cfg -echo ReadmeText=\'$ReadmeText\' >> AppSettings.cfg +cat /dev/null > AndroidAppSettings.cfg +echo "# The application settings for Android libSDL port" >> AndroidAppSettings.cfg +echo AppSettingVersion=$CHANGE_APP_SETTINGS_VERSION >> AndroidAppSettings.cfg +echo LibSdlVersion=$LibSdlVersion >> AndroidAppSettings.cfg +echo AppName=\"$AppName\" >> AndroidAppSettings.cfg +echo AppFullName=$AppFullName >> AndroidAppSettings.cfg +echo ScreenOrientation=$ScreenOrientation >> AndroidAppSettings.cfg +echo AppDataDownloadUrl=\"$AppDataDownloadUrl\" >> AndroidAppSettings.cfg +echo SdlVideoResize=$SdlVideoResize >> AndroidAppSettings.cfg +echo NeedDepthBuffer=$NeedDepthBuffer >> AndroidAppSettings.cfg +echo AppUsesMouse=$AppUsesMouse >> AndroidAppSettings.cfg +echo AppNeedsArrowKeys=$AppNeedsArrowKeys >> AndroidAppSettings.cfg +echo AppUsesJoystick=$AppUsesJoystick >> AndroidAppSettings.cfg +echo AppUsesMultitouch=$AppUsesMultitouch >> AndroidAppSettings.cfg +echo RedefinedKeys=\"$RedefinedKeys\" >> AndroidAppSettings.cfg +echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AndroidAppSettings.cfg +echo AppTouchscreenKeyboardKeysAmountAutoFire=$AppTouchscreenKeyboardKeysAmountAutoFire >> AndroidAppSettings.cfg +echo MultiABI=$MultiABI >> AndroidAppSettings.cfg +echo AppVersionCode=$AppVersionCode >> AndroidAppSettings.cfg +echo AppVersionName=\"$AppVersionName\" >> AndroidAppSettings.cfg +echo CompiledLibraries=\"$CompiledLibraries\" >> AndroidAppSettings.cfg +echo AppCflags=\'$AppCflags\' >> AndroidAppSettings.cfg +echo AppLdflags=\'$AppLdflags\' >> AndroidAppSettings.cfg +echo ReadmeText=\'$ReadmeText\' >> AndroidAppSettings.cfg AppShortName=`echo $AppName | sed 's/ //g'` DataPath="$AppFullName" diff --git a/project/AndroidManifest.xml b/project/AndroidManifest.xml index 9c08786ae..3bd39687a 100644 --- a/project/AndroidManifest.xml +++ b/project/AndroidManifest.xml @@ -1,8 +1,8 @@ - TeeWorlds + Commander Genius diff --git a/project/src/Accelerometer.java b/project/src/Accelerometer.java index a6a1efd6d..05836478e 100644 --- a/project/src/Accelerometer.java +++ b/project/src/Accelerometer.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Audio.java b/project/src/Audio.java index 4e601c64f..a774a95fd 100644 --- a/project/src/Audio.java +++ b/project/src/Audio.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; diff --git a/project/src/DataDownloader.java b/project/src/DataDownloader.java index 9e13aa72f..06f2f9bdc 100644 --- a/project/src/DataDownloader.java +++ b/project/src/DataDownloader.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/GLSurfaceView_SDL.java b/project/src/GLSurfaceView_SDL.java index aa2c30c3a..dc98d423f 100644 --- a/project/src/GLSurfaceView_SDL.java +++ b/project/src/GLSurfaceView_SDL.java @@ -18,7 +18,7 @@ fixed with a hammer and rasp to work with libSDL port */ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import java.io.Writer; import java.util.ArrayList; diff --git a/project/src/Globals.java b/project/src/Globals.java index 59c985831..405e721dd 100644 --- a/project/src/Globals.java +++ b/project/src/Globals.java @@ -1,14 +1,14 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; class Globals { - public static String ApplicationName = "TeeWorlds"; + public static String ApplicationName = "CommanderGenius"; // Should be zip file - public static String DataDownloadUrl = "Game data is 8 Mb|http://sourceforge.net/projects/libsdl-android/files/TeeWorlds/teeworlds.zip/download"; + public static String DataDownloadUrl = "Data files size is 1 Mb|https://sourceforge.net/projects/libsdl-android/files/CommanderGenius/commandergenius-data.zip/download"; // Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D public static boolean NeedDepthBuffer = false; @@ -19,7 +19,7 @@ class Globals { // Readme text to be shown on download page public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n"); - public static boolean AppUsesMouse = true; + public static boolean AppUsesMouse = false; public static boolean AppNeedsArrowKeys = true; @@ -27,9 +27,9 @@ class Globals { public static boolean AppUsesMultitouch = false; - public static int AppTouchscreenKeyboardKeysAmount = 6; + public static int AppTouchscreenKeyboardKeysAmount = 4; - public static int AppTouchscreenKeyboardKeysAmountAutoFire = 0; + public static int AppTouchscreenKeyboardKeysAmountAutoFire = 1; // Phone-specific config // It will download app data to /sdcard/alienblaster if set to true, @@ -48,5 +48,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); }; } diff --git a/project/src/MainActivity.java b/project/src/MainActivity.java index 86a9341ee..fb9f113a7 100644 --- a/project/src/MainActivity.java +++ b/project/src/MainActivity.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Settings.java b/project/src/Settings.java index 4547c696f..a0b2df750 100644 --- a/project/src/Settings.java +++ b/project/src/Settings.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import android.app.Activity; import android.content.Context; diff --git a/project/src/Video.java b/project/src/Video.java index c600aae45..8967a448b 100644 --- a/project/src/Video.java +++ b/project/src/Video.java @@ -1,5 +1,5 @@ // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount -package com.teeworlds; +package net.sourceforge.clonekeenplus; import javax.microedition.khronos.opengles.GL10;