Skip to content
Browse files

Renamed AppSettings to AndroidAppSettings everywhere, added symlink t…

…o CommanderGenius repo
  • Loading branch information...
1 parent 7a00d64 commit 62a82ec84d1556d99c795ce5cc84fd5b58f3c0f6 @pelya committed Sep 10, 2010
View
1 AndroidAppSettings.cfg
View
1 AppSettings.cfg
View
49 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"
View
6 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.teeworlds"
- android:versionCode="5201"
- android:versionName="0.5.2.01"
+ package="net.sourceforge.clonekeenplus"
+ android:versionCode="32201"
+ android:versionName="0.3.2.2.01"
android:installLocation="preferExternal"
>
<application android:label="@string/app_name"
View
14 project/jni/Android.mk
@@ -1,6 +1,6 @@
# 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
# SDL_SHARED_LIBRARIES_PATH := /data/data/de.schwardtnet.alienblaster/lib
@@ -10,7 +10,7 @@ SDL_JAVA_PACKAGE_PATH := com_teeworlds
# 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.teeworlds
+SDL_CURDIR_PATH := net.sourceforge.clonekeenplus
# Android Dev Phone G1 has trackball instead of cursor keys, and
# 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
# 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
SDL_MIXER_USE_LIBMAD :=
View
4 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_image
+APP_MODULES := application sdl sdl_main stlport tremor png jpeg freetype sdl_mixer
-APP_ABI := armeabi armeabi-v7a
+APP_ABI := armeabi
View
0 .../application/alienblaster/AppSettings.cfg → ...ation/alienblaster/AndroidAppSettings.cfg
File renamed without changes.
View
1 project/jni/application/commandergenius
View
0 ...application/jooleem_0.1.4/AppSettings.cfg → ...tion/jooleem_0.1.4/AndroidAppSettings.cfg
File renamed without changes.
View
0 ...ni/application/opentyrian/AppSettings.cfg → ...ication/opentyrian/AndroidAppSettings.cfg
File renamed without changes.
View
0 project/jni/application/sc2/AppSettings.cfg → ...ni/application/sc2/AndroidAppSettings.cfg
File renamed without changes.
View
2 project/jni/application/src
View
0 ...jni/application/teeworlds/AppSettings.cfg → ...lication/teeworlds/AndroidAppSettings.cfg
File renamed without changes.
View
2 project/res/values/strings.xml
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">TeeWorlds</string>
+ <string name="app_name">Commander Genius</string>
</resources>
View
2 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;
View
2 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;
View
2 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;
View
2 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;
View
14 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,17 +19,17 @@
// 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;
public static boolean AppUsesJoystick = 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
// It will download app data to /sdcard/alienblaster if set to true,
@@ -48,5 +48,5 @@
}
class LoadLibrary {
- public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_image"); };
+ public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); };
}
View
2 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;
View
2 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;
View
2 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;

0 comments on commit 62a82ec

Please sign in to comment.
Something went wrong with that request. Please try again.