X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=android%2FREADME;h=2d89cb9de9e209e44777dc5a71f4863ccd4d78fa;hb=397f9cdedf0fb2a1a51d4f585db266b0f4925d97;hp=e99a2f6342225d6ecd78920a7b44c8ef31af4453;hpb=c2c92502388d8ac34c0f64c124cad68d6b142796;p=d2df-sdl.git

diff --git a/android/README b/android/README
index e99a2f6..2d89cb9 100644
--- a/android/README
+++ b/android/README
@@ -14,13 +14,14 @@ Requirements:
 * FPC >= 3.0.4;
 * SDL >= 2.0.7;
 * SDL_mixer >= 2.0;
-* libenet >= 1.3.13;
-* nanoGL.
+* libenet >= 1.3.13.
 
-D2DF uses special version of nanoGL ( https://github.com/DeaDDooMER/nanogl ) with some added functions.
 Build all shared libraries using NDK toolchain and put into directory ./ass/lib/armeabi-v7a/.
 Also you need to build FPC crosscompiler ( http://wiki.freepascal.org/Android ).
 
+If you want to pack game resources into APK, add it into directory "resources".
+If you want to play MIDI music, add instruments and timidity.cfg into directory "resources" (you can grab it from https://www.libsdl.org/projects/SDL_mixer/timidity/timidity.tar.gz).
+
 Generate keys:
 ```
 keytool -genkey -validity 10000 \
@@ -40,7 +41,7 @@ rm -rf tmp
 mkdir -p tmp
 cd ../src/game
 ppcrossarm \
-        -g -gl -dUSE_SDLMIXER -dUSE_NANOGL -O3 \
+        -g -gl -dUSE_SDLMIXER -dUSE_GLES1 -O3 \
         -Tandroid \
         -Cparmv7a \
         -Cfvfpv3 \
@@ -60,7 +61,7 @@ ppcrossarm \
 Build APK and sign it:
 ```
 rm -rf bin obj gen
-mkdir -p bin obj gen
+mkdir -p bin obj gen resources
 aapt package -f -m -S res -J gen -M AndroidManifest.xml -I ${ANDROID_JAR}
 javac -source 1.6 -target 1.6 -d obj -bootclasspath ${ANDROID_JAR} -sourcepath src `find src -name '*.java'`
 dx --dex --output=bin/classes.dex obj
@@ -70,6 +71,7 @@ aapt package -f \
         -J gen \
         -I ${ANDROID_JAR} \
         -F bin/d2df.unsigned.apk \
+	-A resources
         bin ass
 jarsigner -sigalg SHA1withRSA -digestalg SHA1 \
         -keystore d2df.keystore \