-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathandroid.patch
More file actions
132 lines (123 loc) · 4.89 KB
/
android.patch
File metadata and controls
132 lines (123 loc) · 4.89 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
diff -Nur SDL2-2.0.4-orig/android-project/AndroidManifest.xml SDL2-2.0.4/android-project/AndroidManifest.xml
--- SDL2-2.0.4-orig/android-project/AndroidManifest.xml 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/AndroidManifest.xml 2016-09-16 14:18:14.000000000 +0200
@@ -9,7 +9,7 @@
android:installLocation="auto">
<!-- Android 2.3.3 -->
- <uses-sdk android:minSdkVersion="10" android:targetSdkVersion="12" />
+ <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="15" />
<!-- OpenGL ES 2.0 -->
<uses-feature android:glEsVersion="0x00020000" />
@@ -34,6 +34,7 @@
<activity android:name="SDLActivity"
android:label="@string/app_name"
android:configChanges="keyboardHidden|orientation"
+ android:screenOrientation="sensorLandscape"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />
diff -Nur SDL2-2.0.4-orig/android-project/ant.properties SDL2-2.0.4/android-project/ant.properties
--- SDL2-2.0.4-orig/android-project/ant.properties 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/ant.properties 2016-09-16 15:42:50.000000000 +0200
@@ -14,4 +14,8 @@
# 'key.store' for the location of your keystore and
# 'key.alias' for the name of the key to use.
# The password will be asked during the build when you use the 'release' target.
+key.store=android.keystore
+key.alias=key1
+key.store.password=3h
+key.alias.password=3h
diff -Nur SDL2-2.0.4-orig/android-project/default.properties SDL2-2.0.4/android-project/default.properties
--- SDL2-2.0.4-orig/android-project/default.properties 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/default.properties 2016-09-16 14:18:14.000000000 +0200
@@ -8,4 +8,4 @@
# project structure.
# Project target.
-target=android-12
+target=android-15
diff -Nur SDL2-2.0.4-orig/android-project/jni/src/Android.mk SDL2-2.0.4/android-project/jni/src/Android.mk
--- SDL2-2.0.4-orig/android-project/jni/src/Android.mk 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/jni/src/Android.mk 2016-09-16 14:18:14.000000000 +0200
@@ -16,4 +16,6 @@
LOCAL_LDLIBS := -lGLESv1_CM -lGLESv2 -llog
+LOCAL_CFLAGS += -std=c99
+
include $(BUILD_SHARED_LIBRARY)
diff -Nur SDL2-2.0.4-orig/android-project/project.properties SDL2-2.0.4/android-project/project.properties
--- SDL2-2.0.4-orig/android-project/project.properties 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/project.properties 2016-09-16 14:18:14.000000000 +0200
@@ -11,4 +11,4 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
-target=android-12
+target=android-15
diff -Nur SDL2-2.0.4-orig/android-project/res/values/strings.xml SDL2-2.0.4/android-project/res/values/strings.xml
--- SDL2-2.0.4-orig/android-project/res/values/strings.xml 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/android-project/res/values/strings.xml 2016-09-16 14:18:14.000000000 +0200
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name">SDL App</string>
+ <string name="app_name">Sebs BlocDash</string>
</resources>
diff -Nur SDL2-2.0.4-orig/build-scripts/androidbuild.sh SDL2-2.0.4/build-scripts/androidbuild.sh
--- SDL2-2.0.4-orig/build-scripts/androidbuild.sh 2016-01-02 20:56:31.000000000 +0100
+++ SDL2-2.0.4/build-scripts/androidbuild.sh 2016-09-16 14:36:38.000000000 +0200
@@ -8,14 +8,14 @@
if [[ $# -ge 2 ]]; then
for src in ${@:2}
do
- SOURCES+=($src)
+ SOURCES="$SOURCES $src"
MKSOURCES="$MKSOURCES $(basename $src)"
done
else
if [ -n "$1" ]; then
while read src
do
- SOURCES+=($src)
+ SOURCES="$SOURCES $src"
MKSOURCES="$MKSOURCES $(basename $src)"
done
fi
@@ -87,15 +87,9 @@
fi
cp -r $SDLPATH/Android.mk $BUILDPATH/jni/SDL
-sed -i "s|YourSourceHere.c|$MKSOURCES|g" $BUILDPATH/jni/src/Android.mk
+sed -i "s|YourSourceHere.c|$SOURCES|g" $BUILDPATH/jni/src/Android.mk
sed -i "s|org\.libsdl\.app|$APP|g" $BUILDPATH/AndroidManifest.xml
-# Copy user sources
-for src in "${SOURCES[@]}"
-do
- cp $src $BUILDPATH/jni/src
-done
-
# Create an inherited Activity
cd $BUILDPATH/src
for folder in "${APPARR[@]}"
@@ -112,24 +106,3 @@
echo "package $APP;" > "$ACTIVITY.java"
echo "import org.libsdl.app.SDLActivity;" >> "$ACTIVITY.java"
echo "public class $ACTIVITY extends SDLActivity {}" >> "$ACTIVITY.java"
-
-# Update project and build
-cd $BUILDPATH
-$ANDROID update project --path $BUILDPATH
-$NDKBUILD -j $NCPUS $NDKARGS
-$ANT debug
-
-cd $CURDIR
-
-APK="$BUILDPATH/bin/$APP-debug.apk"
-
-if [ -f "$APK" ]; then
- echo "Your APK is ready at $APK"
- echo "To install to your device: "
- echo "cd $BUILDPATH"
- echo "ant debug install"
- exit 0
-fi
-
-echo "There was an error building the APK"
-exit 1
\ No newline at end of file