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

Updated javaSDL2

Browse Source
This commit is contained in:
Gerhard Stein
2020-10-04 10:19:21 +00:00
parent a0bded0cce
commit d611b7655b
35 changed files with 5851 additions and 8896 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
changeAppSettings.sh
View File

@@ -68,11 +68,16 @@ if [ "$AppUsesJoystick" != "y" ]; then
AppUsesSecondJoystick=n
fi
if [ "$LibSdlVersion" = "2.0" ]; then
echo Patch of settings menu not supported in SDL 2.0
else
MenuOptionsAvailable=
for FF in Menu MenuMisc MenuMouse MenuKeyboard ; do
MenuOptionsAvailable1=`grep 'extends Menu' $JAVA_SRC_PATH/Settings$FF.java | sed "s/.* class \(.*\) extends .*/Settings$FF.\1/" | tr '\n' ' '`
MenuOptionsAvailable="$MenuOptionsAvailable $MenuOptionsAvailable1"
done
fi
FirstStartMenuOptionsDefault='new SettingsMenuMisc.ShowReadme(), (AppUsesMouse \&\& \! ForceRelativeMouseMode \? new SettingsMenuMouse.DisplaySizeConfig(true) : new SettingsMenu.DummyMenu()), new SettingsMenuMisc.OptionalDownloadConfig(true), new SettingsMenuMisc.GyroscopeCalibration()'
@@ -809,26 +814,26 @@ fi
rm -rf project/src
mkdir -p project/src
cd $JAVA_SRC_PATH
for F in *.java; do
echo '// DO NOT EDIT THIS FILE - it is automatically generated, ALL YOUR CHANGES WILL BE OVERWRITTEN, edit the file under $JAVA_SRC_PATH dir' | cat - $F > ../src/$F
done
if [ -e ../jni/application/src/java.diff ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.diff || exit 1 ; fi
if [ -e ../jni/application/src/java.patch ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.patch || exit 1 ; fi
if ls ../jni/application/src/*.java > /dev/null 2>&1; then cp -f ../jni/application/src/*.java ../src ; fi
if [ "$LibSdlVersion" = "2.0" ] ; then
echo Patching java with SDL 2.0 not supported
else
if [ -e ../jni/application/src/java.diff ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.diff || exit 1 ; fi
if [ -e ../jni/application/src/java.patch ]; then patch -d ../src --no-backup-if-mismatch < ../jni/application/src/java.patch || exit 1 ; fi
if ls ../jni/application/src/*.java > /dev/null 2>&1; then cp -f ../jni/application/src/*.java ../src ; fi
for F in ../src/*.java; do
for F in ../src/*.java; do
echo Patching $F
$SEDI "s/^package .*;/package $AppFullName;/" $F
done
done
fi
cd ../..
# In case we use SDL2 let simlink the SDLActivity source file
if [ "$LibSdlVersion" = "2.0" ] ; then
ln -s ../jni/sdl-2.0/android-project/src/org/libsdl/app/SDLActivity.java project/src/SDLActivity.java
fi
echo Patching project/AndroidManifest.xml
cat project/AndroidManifestTemplate.xml | \
@@ -937,6 +942,9 @@ else
fi
if [ "$LibSdlVersion" = "2.0" ] ; then
echo Patching java files not supported in SDL 2.0 yet.
else
echo Patching project/src/Globals.java
$SEDI "s/public static String ApplicationName = .*;/public static String ApplicationName = \"$AppShortName\";/" project/src/Globals.java
$SEDI "s/public static final boolean Using_SDL_1_3 = .*;/public static final boolean Using_SDL_1_3 = $UsingSdl13;/" project/src/Globals.java
@@ -1002,6 +1010,7 @@ $SEDI "s/public static String AdmobBannerSize = .*/public static String AdmobBan
$SEDI "s%public static String GooglePlayGameServicesId = .*%public static String GooglePlayGameServicesId = \"$GooglePlayGameServicesId\";%" project/src/Globals.java
$SEDI "s/public static String AppLibraries.*/public static String AppLibraries[] = { $LibrariesToLoad };/" project/src/Globals.java
$SEDI "s/public static String AppMainLibraries.*/public static String AppMainLibraries[] = { $MainLibrariesToLoad };/" project/src/Globals.java
fi
# TODO: We should not build png, jpeg if SDL2_image is used
@@ -1050,13 +1059,16 @@ echo Patching strings.xml
rm -rf project/res/values*/strings.xml
cd $JAVA_SRC_PATH/translations
for F in */strings.xml; do
mkdir -p ../../res/`dirname $F`
cat $F | \
sed "s^[<]string name=\"app_name\"[>].*^<string name=\"app_name\">$AppName</string>^" > \
../../res/$F
mkdir -p ../../res/`dirname $F`
cat $F | \
sed "s^[<]string name=\"app_name\"[>].*^<string name=\"app_name\">$AppName</string>^" > \
../../res/$F
done
cd ../../..
SDK_DIR=`grep '^sdk.dir' project/local.properties | sed 's/.*=//'`
[ -z "$SDK_DIR" ] && SDK_DIR=`which android | sed 's@/tools/android$@@'`
mkdir -p project/libs