Android: added timidity.cfg to game files, so midi music can playing now

diff --git a/android/README b/android/README
index b10d352fa604c729e6b7e63aed1fe7d93a01edc7..2d89cb9de9e209e44777dc5a71f4863ccd4d78fa 100644 (file)
--- a/android/README
+++ b/android/README
@@ -18,7 +18,9 @@ Requirements:
 
 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 ).
-Put game resources into direcotor resources/ (or install it manually into external/internal storage).
+
+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:
 ```

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index ca1766609ac4b4a689bca384dba7db7d0a530ff8..07e63eeb8743f971221a2f252c3a1550cd79e533 100644 (file)
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -29,5 +29,7 @@ public class Doom2DF extends SDLActivity {
                CopyAssets.copyAssets(SDL.getContext(), "maps");
                CopyAssets.copyAssets(SDL.getContext(), "maps/megawads");
                CopyAssets.copyAssets(SDL.getContext(), "wads");
+               CopyAssets.copyAssets(SDL.getContext(), "instruments");
+               CopyAssets.copyAssets(SDL.getContext(), "timidity.cfg");
        }
 }

diff --git a/src/game/Doom2DF.lpr b/src/game/Doom2DF.lpr
index 3c3c94a706a5f93a11c0733af44340fe056bf4cc..c86d7441e795240e6d4ec170060d2f34cc45f406 100644 (file)
--- a/src/game/Doom2DF.lpr
+++ b/src/game/Doom2DF.lpr
@@ -159,6 +159,7 @@ begin
       exit;
     end;
   end;
+  SetEnvVar('TIMIDITY_CFG', 'timidity.cfg');
 {$ENDIF ANDROID}
 
   for f := 1 to ParamCount do