AdMob support added, you cannot yet hide or reposition the ad from the C code. Also did some cleanup on include files.
This commit is contained in:
@@ -564,6 +564,48 @@ if [ -n "$ReadmeText1" ] ; then
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$AUTO" -o -z "$AdmobPublisherId" ]; then
|
||||
echo
|
||||
echo -n "Your AdMob Publisher ID, (n) if you don't want advertisements ($AdmobPublisherId): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
AdmobPublisherId="$var"
|
||||
CHANGED=1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$AdmobPublisherId" '!=' "n" ]; then
|
||||
if [ -z "$AUTO" -o -z "$AdmobTestDeviceId" ]; then
|
||||
echo
|
||||
echo -n "Your AdMob test device ID, to receive a test ad ($AdmobTestDeviceId): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
AdmobTestDeviceId="$var"
|
||||
CHANGED=1
|
||||
fi
|
||||
fi
|
||||
if [ -z "$AUTO" -o -z "$AdmobBannerSize" ]; then
|
||||
echo
|
||||
echo -n "Your AdMob banner size (BANNER/IAB_BANNER/IAB_LEADERBOARD/IAB_MRECT/IAB_WIDE_SKYSCRAPER/SMART_BANNER) ($AdmobBannerSize): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
AdmobBannerSize="$var"
|
||||
CHANGED=1
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ -z "$AUTO" -o -z "$MinimumScreenSize" ]; then
|
||||
echo
|
||||
echo "Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens"
|
||||
echo -n "Minimum screen size that application supports: (s)mall / (n)ormal / (l)arge ($MinimumScreenSize): "
|
||||
read var
|
||||
if [ -n "$var" ] ; then
|
||||
MinimumScreenSize="$var"
|
||||
CHANGED=1
|
||||
fi
|
||||
fi
|
||||
|
||||
echo
|
||||
|
||||
if [ -n "$CHANGED" ]; then
|
||||
@@ -615,6 +657,10 @@ echo AppLdflags=\'$AppLdflags\' >> AndroidAppSettings.cfg
|
||||
echo AppSubdirsBuild=\'$AppSubdirsBuild\' >> AndroidAppSettings.cfg
|
||||
echo AppCmdline=\'$AppCmdline\' >> AndroidAppSettings.cfg
|
||||
echo ReadmeText=\'$ReadmeText\' >> AndroidAppSettings.cfg
|
||||
echo MinimumScreenSize=$MinimumScreenSize >> AndroidAppSettings.cfg
|
||||
echo AdmobPublisherId=$AdmobPublisherId >> AndroidAppSettings.cfg
|
||||
echo AdmobTestDeviceId=$AdmobTestDeviceId >> AndroidAppSettings.cfg
|
||||
echo AdmobBannerSize=$AdmobBannerSize >> AndroidAppSettings.cfg
|
||||
fi
|
||||
|
||||
AppShortName=`echo $AppName | sed 's/ //g'`
|
||||
@@ -811,14 +857,6 @@ fi
|
||||
|
||||
ReadmeText="`echo $ReadmeText | sed 's/\"/\\\\\\\\\"/g' | sed 's/[&%]//g'`"
|
||||
|
||||
echo Patching project/AndroidManifest.xml
|
||||
cat project/AndroidManifestTemplate.xml | \
|
||||
sed "s/package=.*/package=\"$AppFullName\"/" | \
|
||||
sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
|
||||
sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
|
||||
sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
|
||||
project/AndroidManifest.xml
|
||||
|
||||
rm -rf project/src
|
||||
mkdir -p project/src
|
||||
cd project/java
|
||||
@@ -829,6 +867,38 @@ for F in *.java; do
|
||||
done
|
||||
cd ../..
|
||||
|
||||
echo Patching project/AndroidManifest.xml
|
||||
cat project/AndroidManifestTemplate.xml | \
|
||||
sed "s/package=.*/package=\"$AppFullName\"/" | \
|
||||
sed "s/android:screenOrientation=.*/android:screenOrientation=\"$ScreenOrientation1\"/" | \
|
||||
sed "s^android:versionCode=.*^android:versionCode=\"$AppVersionCode\"^" | \
|
||||
sed "s^android:versionName=.*^android:versionName=\"$AppVersionName\"^" > \
|
||||
project/AndroidManifest.xml
|
||||
if [ "$AdmobPublisherId" = "n" -o -z "$AdmobPublisherId" ] ; then
|
||||
sed -i "/==ADMOB==/ d" project/AndroidManifest.xml
|
||||
AdmobPublisherId=""
|
||||
else
|
||||
F=project/java/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
|
||||
cat $F | sed "s/package .*;/package $AppFullName;/" >> project/src/Advertisement.java
|
||||
fi
|
||||
|
||||
case "$MinimumScreenSize" in
|
||||
n|m)
|
||||
sed -i "/==SCREEN-SIZE-SMALL==/ d" project/AndroidManifest.xml
|
||||
sed -i "/==SCREEN-SIZE-LARGE==/ d" project/AndroidManifest.xml
|
||||
;;
|
||||
l)
|
||||
sed -i "/==SCREEN-SIZE-SMALL==/ d" project/AndroidManifest.xml
|
||||
sed -i "/==SCREEN-SIZE-NORMAL==/ d" project/AndroidManifest.xml
|
||||
;;
|
||||
*)
|
||||
sed -i "/==SCREEN-SIZE-NORMAL==/ d" project/AndroidManifest.xml
|
||||
sed -i "/==SCREEN-SIZE-LARGE==/ d" project/AndroidManifest.xml
|
||||
;;
|
||||
esac
|
||||
|
||||
echo Patching project/src/Globals.java
|
||||
cat project/src/Globals.java | \
|
||||
sed "s/public static String ApplicationName = .*;/public static String ApplicationName = \"$AppShortName\";/" | \
|
||||
@@ -863,6 +933,9 @@ cat project/src/Globals.java | \
|
||||
sed "s@public static Settings.Menu FirstStartMenuOptions .*;@public static Settings.Menu FirstStartMenuOptions [] = { $FirstStartMenuOptions };@" | \
|
||||
sed "s%public static String ReadmeText = .*%public static String ReadmeText = \"$ReadmeText\".replace(\"^\",\"\\\n\");%" | \
|
||||
sed "s%public static String CommandLine = .*%public static String CommandLine = \"$AppCmdline\";%" | \
|
||||
sed "s/public static String AdmobPublisherId = .*/public static String AdmobPublisherId = \"$AdmobPublisherId\";/" | \
|
||||
sed "s/public static String AdmobTestDeviceId = .*/public static String AdmobTestDeviceId = \"$AdmobTestDeviceId\";/" | \
|
||||
sed "s/public static String AdmobBannerSize = .*/public static String AdmobBannerSize = \"$AdmobBannerSize\";/" | \
|
||||
sed "s/public static String AppLibraries.*/public static String AppLibraries[] = { $LibrariesToLoad };/" > \
|
||||
project/src/Globals.java.1
|
||||
mv -f project/src/Globals.java.1 project/src/Globals.java
|
||||
@@ -897,7 +970,7 @@ done
|
||||
cd ../../..
|
||||
|
||||
echo Cleaning up dependencies
|
||||
rm -rf project/libs/* project/gen
|
||||
rm -rf project/libs/*/* project/gen
|
||||
for OUT in obj; do
|
||||
rm -rf project/$OUT/local/*/objs*/sdl_main/* project/$OUT/local/*/libsdl_main.so
|
||||
rm -rf project/$OUT/local/*/libsdl-*.so
|
||||
|
||||
Reference in New Issue
Block a user