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

Renamed AppSettings to AndroidAppSettings everywhere, added symlink to CommanderGenius repo

Browse Source
This commit is contained in:
pelya
2010-09-10 14:11:20 +03:00
parent 7a00d64a19
commit 62a82ec84d
22 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AndroidAppSettings.cfg Symbolic link
View File

@@ -0,0 +1 @@
project/jni/application/src/AndroidAppSettings.cfg

1
AppSettings.cfg
View File

@@ -1 +0,0 @@
project/jni/application/src/AppSettings.cfg

49
ChangeAppSettings.sh
View File

@@ -7,7 +7,7 @@ if [ "X$1" = "X-a" ]; then
AUTO=1 AUTO=1
fi fi
. ./AppSettings.cfg . ./AndroidAppSettings.cfg
if [ "$CHANGE_APP_SETTINGS_VERSION" != "$AppSettingVersion" ]; then if [ "$CHANGE_APP_SETTINGS_VERSION" != "$AppSettingVersion" ]; then
AUTO= AUTO=
@@ -185,29 +185,30 @@ fi # AUTO
echo echo
cat /dev/null > AppSettings.cfg cat /dev/null > AndroidAppSettings.cfg
echo AppSettingVersion=$CHANGE_APP_SETTINGS_VERSION >> AppSettings.cfg echo "# The application settings for Android libSDL port" >> AndroidAppSettings.cfg
echo LibSdlVersion=$LibSdlVersion >> AppSettings.cfg echo AppSettingVersion=$CHANGE_APP_SETTINGS_VERSION >> AndroidAppSettings.cfg
echo AppName=\"$AppName\" >> AppSettings.cfg echo LibSdlVersion=$LibSdlVersion >> AndroidAppSettings.cfg
echo AppFullName=$AppFullName >> AppSettings.cfg echo AppName=\"$AppName\" >> AndroidAppSettings.cfg
echo ScreenOrientation=$ScreenOrientation >> AppSettings.cfg echo AppFullName=$AppFullName >> AndroidAppSettings.cfg
echo AppDataDownloadUrl=\"$AppDataDownloadUrl\" >> AppSettings.cfg echo ScreenOrientation=$ScreenOrientation >> AndroidAppSettings.cfg
echo SdlVideoResize=$SdlVideoResize >> AppSettings.cfg echo AppDataDownloadUrl=\"$AppDataDownloadUrl\" >> AndroidAppSettings.cfg
echo NeedDepthBuffer=$NeedDepthBuffer >> AppSettings.cfg echo SdlVideoResize=$SdlVideoResize >> AndroidAppSettings.cfg
echo AppUsesMouse=$AppUsesMouse >> AppSettings.cfg echo NeedDepthBuffer=$NeedDepthBuffer >> AndroidAppSettings.cfg
echo AppNeedsArrowKeys=$AppNeedsArrowKeys >> AppSettings.cfg echo AppUsesMouse=$AppUsesMouse >> AndroidAppSettings.cfg
echo AppUsesJoystick=$AppUsesJoystick >> AppSettings.cfg echo AppNeedsArrowKeys=$AppNeedsArrowKeys >> AndroidAppSettings.cfg
echo AppUsesMultitouch=$AppUsesMultitouch >> AppSettings.cfg echo AppUsesJoystick=$AppUsesJoystick >> AndroidAppSettings.cfg
echo RedefinedKeys=\"$RedefinedKeys\" >> AppSettings.cfg echo AppUsesMultitouch=$AppUsesMultitouch >> AndroidAppSettings.cfg
echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AppSettings.cfg echo RedefinedKeys=\"$RedefinedKeys\" >> AndroidAppSettings.cfg
echo AppTouchscreenKeyboardKeysAmountAutoFire=$AppTouchscreenKeyboardKeysAmountAutoFire >> AppSettings.cfg echo AppTouchscreenKeyboardKeysAmount=$AppTouchscreenKeyboardKeysAmount >> AndroidAppSettings.cfg
echo MultiABI=$MultiABI >> AppSettings.cfg echo AppTouchscreenKeyboardKeysAmountAutoFire=$AppTouchscreenKeyboardKeysAmountAutoFire >> AndroidAppSettings.cfg
echo AppVersionCode=$AppVersionCode >> AppSettings.cfg echo MultiABI=$MultiABI >> AndroidAppSettings.cfg
echo AppVersionName=\"$AppVersionName\" >> AppSettings.cfg echo AppVersionCode=$AppVersionCode >> AndroidAppSettings.cfg
echo CompiledLibraries=\"$CompiledLibraries\" >> AppSettings.cfg echo AppVersionName=\"$AppVersionName\" >> AndroidAppSettings.cfg
echo AppCflags=\'$AppCflags\' >> AppSettings.cfg echo CompiledLibraries=\"$CompiledLibraries\" >> AndroidAppSettings.cfg
echo AppLdflags=\'$AppLdflags\' >> AppSettings.cfg echo AppCflags=\'$AppCflags\' >> AndroidAppSettings.cfg
echo ReadmeText=\'$ReadmeText\' >> AppSettings.cfg echo AppLdflags=\'$AppLdflags\' >> AndroidAppSettings.cfg
echo ReadmeText=\'$ReadmeText\' >> AndroidAppSettings.cfg
AppShortName=`echo $AppName | sed 's/ //g'` AppShortName=`echo $AppName | sed 's/ //g'`
DataPath="$AppFullName" DataPath="$AppFullName"

6
project/AndroidManifest.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.teeworlds" package="net.sourceforge.clonekeenplus"
android:versionCode="5201" android:versionCode="32201"
android:versionName="0.5.2.01" android:versionName="0.3.2.2.01"
android:installLocation="preferExternal" android:installLocation="preferExternal"
> >
<application android:label="@string/app_name" <application android:label="@string/app_name"

14
project/jni/Android.mk
View File

@@ -1,6 +1,6 @@
# The namespace in Java file, with dots replaced with underscores # The namespace in Java file, with dots replaced with underscores
SDL_JAVA_PACKAGE_PATH := com_teeworlds SDL_JAVA_PACKAGE_PATH := net_sourceforge_clonekeenplus
# Path to shared libraries - Android 1.6 cannot load them properly, thus we have to specify absolute path here # 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 # SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := com_teeworlds
# Typically /sdcard/alienblaster # Typically /sdcard/alienblaster
# Or /data/data/de.schwardtnet.alienblaster/files if you're planning to unpack data in application private folder # 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 # Your application will just set current directory there
SDL_CURDIR_PATH := com.teeworlds SDL_CURDIR_PATH := net.sourceforge.clonekeenplus
# Android Dev Phone G1 has trackball instead of cursor keys, and # Android Dev Phone G1 has trackball instead of cursor keys, and
# sends trackball movement events as rapid KeyDown/KeyUp events, # sends trackball movement events as rapid KeyDown/KeyUp events,
@@ -21,15 +21,15 @@ SDL_TRACKBALL_KEYUP_DELAY := 1
# If the application designed for higher screen resolution enable this to get the screen # If the application designed for higher screen resolution enable this to get the screen
# resized in HW-accelerated way, however it eats a tiny bit of CPU # resized in HW-accelerated way, however it eats a tiny bit of CPU
SDL_VIDEO_RENDER_RESIZE := 0 SDL_VIDEO_RENDER_RESIZE := 1
COMPILED_LIBRARIES := sdl_image COMPILED_LIBRARIES := sdl_mixer
APPLICATION_ADDITIONAL_CFLAGS := -O2 APPLICATION_ADDITIONAL_CFLAGS := -finline-functions -O2
APPLICATION_ADDITIONAL_LDFLAGS := -Lbin/ndk/local/armeabi -lfreetype APPLICATION_ADDITIONAL_LDFLAGS :=
SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=SPACE -DSDL_ANDROID_KEYCODE_1=RETURN -DSDL_ANDROID_KEYCODE_2=LEFT -DSDL_ANDROID_KEYCODE_3=RIGHT -DSDL_ANDROID_KEYCODE_4=LSHIFT -DSDL_ANDROID_KEYCODE_5=ESCAPE -DSDL_ANDROID_KEYCODE_6=RSHIFT -DSDL_ANDROID_KEYCODE_7=LSHIFT SDL_ADDITIONAL_CFLAGS := -DSDL_ANDROID_KEYCODE_MOUSE=UNKNOWN -DSDL_ANDROID_KEYCODE_0=LCTRL -DSDL_ANDROID_KEYCODE_1=LALT -DSDL_ANDROID_KEYCODE_2=SPACE -DSDL_ANDROID_KEYCODE_3=RETURN -DSDL_ANDROID_KEYCODE_4=RETURN
# If SDL_Mixer should link to libMAD # If SDL_Mixer should link to libMAD
SDL_MIXER_USE_LIBMAD := SDL_MIXER_USE_LIBMAD :=

4
project/jni/Application.mk
View File

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

0
project/jni/application/alienblaster/AppSettings.cfg → project/jni/application/alienblaster/AndroidAppSettings.cfg
View File

1
project/jni/application/commandergenius Symbolic link
View File

@@ -0,0 +1 @@
../../../../commandergenius

0
project/jni/application/jooleem_0.1.4/AppSettings.cfg → project/jni/application/jooleem_0.1.4/AndroidAppSettings.cfg
View File

0
project/jni/application/opentyrian/AppSettings.cfg → project/jni/application/opentyrian/AndroidAppSettings.cfg
View File

0
project/jni/application/sc2/AppSettings.cfg → project/jni/application/sc2/AndroidAppSettings.cfg
View File

2
project/jni/application/src
View File

@@ -1 +1 @@
teeworlds commandergenius

0
project/jni/application/teeworlds/AppSettings.cfg → project/jni/application/teeworlds/AndroidAppSettings.cfg
View File

2
project/res/values/strings.xml
View File

@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="app_name">TeeWorlds</string> <string name="app_name">Commander Genius</string>
</resources> </resources>

2
project/src/Accelerometer.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Audio.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.app.Activity;

2
project/src/DataDownloader.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/GLSurfaceView_SDL.java
View File

@@ -18,7 +18,7 @@
fixed with a hammer and rasp to work with libSDL port */ fixed with a hammer and rasp to work with libSDL port */
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.io.Writer;
import java.util.ArrayList; import java.util.ArrayList;

14
project/src/Globals.java
View File

@@ -1,14 +1,14 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere // 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.app.Activity;
import android.content.Context; import android.content.Context;
class Globals { class Globals {
public static String ApplicationName = "TeeWorlds"; public static String ApplicationName = "CommanderGenius";
// Should be zip file // 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 // 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; public static boolean NeedDepthBuffer = false;
@@ -19,7 +19,7 @@ class Globals {
// Readme text to be shown on download page // 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 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; public static boolean AppNeedsArrowKeys = true;
@@ -27,9 +27,9 @@ class Globals {
public static boolean AppUsesMultitouch = false; 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 // Phone-specific config
// It will download app data to /sdcard/alienblaster if set to true, // It will download app data to /sdcard/alienblaster if set to true,
@@ -48,5 +48,5 @@ class Globals {
} }
class LoadLibrary { class LoadLibrary {
public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); }; public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); };
} }

2
project/src/MainActivity.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Settings.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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.app.Activity;
import android.content.Context; import android.content.Context;

2
project/src/Video.java
View File

@@ -1,5 +1,5 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount // 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; import javax.microedition.khronos.opengles.GL10;