Extra java for SDL2 added, maybe later we can merge it back to one java source later
This commit is contained in:
@@ -3,6 +3,7 @@
|
||||
CHANGE_APP_SETTINGS_VERSION=19
|
||||
AUTO=
|
||||
CHANGED=
|
||||
JAVA_SRC_PATH=project/java
|
||||
|
||||
if [ "X$1" = "X-a" ]; then
|
||||
AUTO=a
|
||||
@@ -34,6 +35,10 @@ if [ -n "$var" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$LibSdlVersion" = "2.0" ]; then
|
||||
JAVA_SRC_PATH=project/javaSDL2
|
||||
fi
|
||||
|
||||
if [ -z "$AppName" -o -z "$AUTO" ]; then
|
||||
echo
|
||||
echo -n "Specify application name (e.x. My Application) ($AppName): "
|
||||
@@ -520,7 +525,7 @@ fi
|
||||
|
||||
MenuOptionsAvailable=
|
||||
for FF in Menu MenuMisc MenuMouse MenuKeyboard ; do
|
||||
MenuOptionsAvailable1=`grep 'extends Menu' project/java/Settings$FF.java | sed "s/.* class \(.*\) extends .*/Settings$FF.\1/" | tr '\n' ' '`
|
||||
MenuOptionsAvailable1=`grep 'extends Menu' $JAVA_SRC_PATH/Settings$FF.java | sed "s/.* class \(.*\) extends .*/Settings$FF.\1/" | tr '\n' ' '`
|
||||
MenuOptionsAvailable="$MenuOptionsAvailable $MenuOptionsAvailable1"
|
||||
done
|
||||
if [ -z "$AUTO" ]; then
|
||||
@@ -1239,10 +1244,10 @@ fi
|
||||
|
||||
rm -rf project/src
|
||||
mkdir -p project/src
|
||||
cd project/java
|
||||
cd $JAVA_SRC_PATH
|
||||
for F in *.java; do
|
||||
echo Patching $F
|
||||
echo '// DO NOT EDIT THIS FILE - it is automatically generated, ALL YOUR CHANGES WILL BE OVERWRITTEN, edit the file under project/java dir' > ../src/$F
|
||||
echo '// DO NOT EDIT THIS FILE - it is automatically generated, ALL YOUR CHANGES WILL BE OVERWRITTEN, edit the file under $JAVA_SRC_PATH dir' > ../src/$F
|
||||
cat $F | sed "s/package .*;/package $AppFullName;/" >> ../src/$F # | sed 's@$@ // THIS FILE IS AUTO-GENERATED@' >>
|
||||
done
|
||||
cd ../..
|
||||
@@ -1258,9 +1263,9 @@ if [ "$AdmobPublisherId" = "n" -o -z "$AdmobPublisherId" ] ; then
|
||||
$SEDI "/==ADMOB==/ d" project/AndroidManifest.xml
|
||||
AdmobPublisherId=""
|
||||
else
|
||||
F=project/java/admob/Advertisement.java
|
||||
F=$JAVA_SRC_PATH/admob/Advertisement.java
|
||||
echo Patching $F
|
||||
echo '// DO NOT EDIT THIS FILE - it is automatically generated, edit file under project/java dir' > project/src/Advertisement.java
|
||||
echo '// DO NOT EDIT THIS FILE - it is automatically generated, edit file under $JAVA_SRC_PATH dir' > project/src/Advertisement.java
|
||||
cat $F | sed "s/package .*;/package $AppFullName;/" >> project/src/Advertisement.java
|
||||
fi
|
||||
|
||||
@@ -1356,7 +1361,7 @@ cat project/jni/SettingsTemplate.mk | \
|
||||
|
||||
echo Patching strings.xml
|
||||
rm -rf project/res/values*
|
||||
cd project/java/translations
|
||||
cd $JAVA_SRC_PATH/translations
|
||||
for F in */strings.xml; do
|
||||
mkdir -p ../../res/`dirname $F`
|
||||
cat $F | \
|
||||
|
||||
Reference in New Issue
Block a user