diff --git a/.gitignore b/.gitignore index 7bc31a45eb1..3793277c993 100644 --- a/.gitignore +++ b/.gitignore @@ -92,7 +92,7 @@ android/.idea android/.gradle # Automatically created Android assets -android/app/src/main/assets/files/ +android/app/src/main/assets/ # Mac magic folders .DS_Store diff --git a/android/app/build.gradle b/android/app/build.gradle index 54991ba2fac..8167f0b5abc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -99,6 +99,14 @@ tasks.register('copyH2D', Copy) { into 'src/main/assets/files/data' } +tasks.register('copyTimidity', Copy) { + from('../../files/timidity') { + include 'instruments/*.pat' + include 'timidity.cfg' + } + into 'src/main/assets' +} + tasks.register('copyTranslations', Copy) { from('../../files/lang') { include '*.mo' @@ -107,5 +115,5 @@ tasks.register('copyTranslations', Copy) { } preBuild { - dependsOn copyH2D, copyTranslations + dependsOn copyH2D, copyTimidity, copyTranslations } diff --git a/android/app/src/main/assets/instruments/README.txt b/files/timidity/instruments/README.txt similarity index 100% rename from android/app/src/main/assets/instruments/README.txt rename to files/timidity/instruments/README.txt diff --git a/android/app/src/main/assets/instruments/acpiano.pat b/files/timidity/instruments/acpiano.pat similarity index 100% rename from android/app/src/main/assets/instruments/acpiano.pat rename to files/timidity/instruments/acpiano.pat diff --git a/android/app/src/main/assets/instruments/agogohi.pat b/files/timidity/instruments/agogohi.pat similarity index 100% rename from android/app/src/main/assets/instruments/agogohi.pat rename to files/timidity/instruments/agogohi.pat diff --git a/android/app/src/main/assets/instruments/agogolo.pat b/files/timidity/instruments/agogolo.pat similarity index 100% rename from android/app/src/main/assets/instruments/agogolo.pat rename to files/timidity/instruments/agogolo.pat diff --git a/android/app/src/main/assets/instruments/bassoon.pat b/files/timidity/instruments/bassoon.pat similarity index 100% rename from android/app/src/main/assets/instruments/bassoon.pat rename to files/timidity/instruments/bassoon.pat diff --git a/android/app/src/main/assets/instruments/belltree.pat b/files/timidity/instruments/belltree.pat similarity index 100% rename from android/app/src/main/assets/instruments/belltree.pat rename to files/timidity/instruments/belltree.pat diff --git a/android/app/src/main/assets/instruments/bongohi.pat b/files/timidity/instruments/bongohi.pat similarity index 100% rename from android/app/src/main/assets/instruments/bongohi.pat rename to files/timidity/instruments/bongohi.pat diff --git a/android/app/src/main/assets/instruments/bongolo.pat b/files/timidity/instruments/bongolo.pat similarity index 100% rename from android/app/src/main/assets/instruments/bongolo.pat rename to files/timidity/instruments/bongolo.pat diff --git a/android/app/src/main/assets/instruments/bowglass.pat b/files/timidity/instruments/bowglass.pat similarity index 100% rename from android/app/src/main/assets/instruments/bowglass.pat rename to files/timidity/instruments/bowglass.pat diff --git a/android/app/src/main/assets/instruments/cabasa.pat b/files/timidity/instruments/cabasa.pat similarity index 100% rename from android/app/src/main/assets/instruments/cabasa.pat rename to files/timidity/instruments/cabasa.pat diff --git a/android/app/src/main/assets/instruments/castinet.pat b/files/timidity/instruments/castinet.pat similarity index 100% rename from android/app/src/main/assets/instruments/castinet.pat rename to files/timidity/instruments/castinet.pat diff --git a/android/app/src/main/assets/instruments/cello.pat b/files/timidity/instruments/cello.pat similarity index 100% rename from android/app/src/main/assets/instruments/cello.pat rename to files/timidity/instruments/cello.pat diff --git a/android/app/src/main/assets/instruments/choir.pat b/files/timidity/instruments/choir.pat similarity index 100% rename from android/app/src/main/assets/instruments/choir.pat rename to files/timidity/instruments/choir.pat diff --git a/android/app/src/main/assets/instruments/church.pat b/files/timidity/instruments/church.pat similarity index 100% rename from android/app/src/main/assets/instruments/church.pat rename to files/timidity/instruments/church.pat diff --git a/android/app/src/main/assets/instruments/claps.pat b/files/timidity/instruments/claps.pat similarity index 100% rename from android/app/src/main/assets/instruments/claps.pat rename to files/timidity/instruments/claps.pat diff --git a/android/app/src/main/assets/instruments/clarinet.pat b/files/timidity/instruments/clarinet.pat similarity index 100% rename from android/app/src/main/assets/instruments/clarinet.pat rename to files/timidity/instruments/clarinet.pat diff --git a/android/app/src/main/assets/instruments/clave.pat b/files/timidity/instruments/clave.pat similarity index 100% rename from android/app/src/main/assets/instruments/clave.pat rename to files/timidity/instruments/clave.pat diff --git a/android/app/src/main/assets/instruments/congahi1.pat b/files/timidity/instruments/congahi1.pat similarity index 100% rename from android/app/src/main/assets/instruments/congahi1.pat rename to files/timidity/instruments/congahi1.pat diff --git a/android/app/src/main/assets/instruments/congahi2.pat b/files/timidity/instruments/congahi2.pat similarity index 100% rename from android/app/src/main/assets/instruments/congahi2.pat rename to files/timidity/instruments/congahi2.pat diff --git a/android/app/src/main/assets/instruments/congalo.pat b/files/timidity/instruments/congalo.pat similarity index 100% rename from android/app/src/main/assets/instruments/congalo.pat rename to files/timidity/instruments/congalo.pat diff --git a/android/app/src/main/assets/instruments/contraba.pat b/files/timidity/instruments/contraba.pat similarity index 100% rename from android/app/src/main/assets/instruments/contraba.pat rename to files/timidity/instruments/contraba.pat diff --git a/android/app/src/main/assets/instruments/cowbell.pat b/files/timidity/instruments/cowbell.pat similarity index 100% rename from android/app/src/main/assets/instruments/cowbell.pat rename to files/timidity/instruments/cowbell.pat diff --git a/android/app/src/main/assets/instruments/cuica1.pat b/files/timidity/instruments/cuica1.pat similarity index 100% rename from android/app/src/main/assets/instruments/cuica1.pat rename to files/timidity/instruments/cuica1.pat diff --git a/android/app/src/main/assets/instruments/cuica2.pat b/files/timidity/instruments/cuica2.pat similarity index 100% rename from android/app/src/main/assets/instruments/cuica2.pat rename to files/timidity/instruments/cuica2.pat diff --git a/android/app/src/main/assets/instruments/cymbell.pat b/files/timidity/instruments/cymbell.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymbell.pat rename to files/timidity/instruments/cymbell.pat diff --git a/android/app/src/main/assets/instruments/cymchina.pat b/files/timidity/instruments/cymchina.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymchina.pat rename to files/timidity/instruments/cymchina.pat diff --git a/android/app/src/main/assets/instruments/cymcrsh1.pat b/files/timidity/instruments/cymcrsh1.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymcrsh1.pat rename to files/timidity/instruments/cymcrsh1.pat diff --git a/android/app/src/main/assets/instruments/cymcrsh2.pat b/files/timidity/instruments/cymcrsh2.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymcrsh2.pat rename to files/timidity/instruments/cymcrsh2.pat diff --git a/android/app/src/main/assets/instruments/cymride1.pat b/files/timidity/instruments/cymride1.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymride1.pat rename to files/timidity/instruments/cymride1.pat diff --git a/android/app/src/main/assets/instruments/cymride2.pat b/files/timidity/instruments/cymride2.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymride2.pat rename to files/timidity/instruments/cymride2.pat diff --git a/android/app/src/main/assets/instruments/cymsplsh.pat b/files/timidity/instruments/cymsplsh.pat similarity index 100% rename from android/app/src/main/assets/instruments/cymsplsh.pat rename to files/timidity/instruments/cymsplsh.pat diff --git a/android/app/src/main/assets/instruments/englhorn.pat b/files/timidity/instruments/englhorn.pat similarity index 100% rename from android/app/src/main/assets/instruments/englhorn.pat rename to files/timidity/instruments/englhorn.pat diff --git a/android/app/src/main/assets/instruments/flute.pat b/files/timidity/instruments/flute.pat similarity index 100% rename from android/app/src/main/assets/instruments/flute.pat rename to files/timidity/instruments/flute.pat diff --git a/android/app/src/main/assets/instruments/frenchrn.pat b/files/timidity/instruments/frenchrn.pat similarity index 100% rename from android/app/src/main/assets/instruments/frenchrn.pat rename to files/timidity/instruments/frenchrn.pat diff --git a/android/app/src/main/assets/instruments/guiro1.pat b/files/timidity/instruments/guiro1.pat similarity index 100% rename from android/app/src/main/assets/instruments/guiro1.pat rename to files/timidity/instruments/guiro1.pat diff --git a/android/app/src/main/assets/instruments/guiro2.pat b/files/timidity/instruments/guiro2.pat similarity index 100% rename from android/app/src/main/assets/instruments/guiro2.pat rename to files/timidity/instruments/guiro2.pat diff --git a/android/app/src/main/assets/instruments/harp.pat b/files/timidity/instruments/harp.pat similarity index 100% rename from android/app/src/main/assets/instruments/harp.pat rename to files/timidity/instruments/harp.pat diff --git a/android/app/src/main/assets/instruments/highq.pat b/files/timidity/instruments/highq.pat similarity index 100% rename from android/app/src/main/assets/instruments/highq.pat rename to files/timidity/instruments/highq.pat diff --git a/android/app/src/main/assets/instruments/hihatcl.pat b/files/timidity/instruments/hihatcl.pat similarity index 100% rename from android/app/src/main/assets/instruments/hihatcl.pat rename to files/timidity/instruments/hihatcl.pat diff --git a/android/app/src/main/assets/instruments/hihatop.pat b/files/timidity/instruments/hihatop.pat similarity index 100% rename from android/app/src/main/assets/instruments/hihatop.pat rename to files/timidity/instruments/hihatop.pat diff --git a/android/app/src/main/assets/instruments/hihatpd.pat b/files/timidity/instruments/hihatpd.pat similarity index 100% rename from android/app/src/main/assets/instruments/hihatpd.pat rename to files/timidity/instruments/hihatpd.pat diff --git a/android/app/src/main/assets/instruments/hrpschrd.pat b/files/timidity/instruments/hrpschrd.pat similarity index 100% rename from android/app/src/main/assets/instruments/hrpschrd.pat rename to files/timidity/instruments/hrpschrd.pat diff --git a/android/app/src/main/assets/instruments/jingles.pat b/files/timidity/instruments/jingles.pat similarity index 100% rename from android/app/src/main/assets/instruments/jingles.pat rename to files/timidity/instruments/jingles.pat diff --git a/android/app/src/main/assets/instruments/kick1.pat b/files/timidity/instruments/kick1.pat similarity index 100% rename from android/app/src/main/assets/instruments/kick1.pat rename to files/timidity/instruments/kick1.pat diff --git a/android/app/src/main/assets/instruments/kick2.pat b/files/timidity/instruments/kick2.pat similarity index 100% rename from android/app/src/main/assets/instruments/kick2.pat rename to files/timidity/instruments/kick2.pat diff --git a/android/app/src/main/assets/instruments/maracas.pat b/files/timidity/instruments/maracas.pat similarity index 100% rename from android/app/src/main/assets/instruments/maracas.pat rename to files/timidity/instruments/maracas.pat diff --git a/android/app/src/main/assets/instruments/marcato.pat b/files/timidity/instruments/marcato.pat similarity index 100% rename from android/app/src/main/assets/instruments/marcato.pat rename to files/timidity/instruments/marcato.pat diff --git a/android/app/src/main/assets/instruments/metbell.pat b/files/timidity/instruments/metbell.pat similarity index 100% rename from android/app/src/main/assets/instruments/metbell.pat rename to files/timidity/instruments/metbell.pat diff --git a/android/app/src/main/assets/instruments/metclick.pat b/files/timidity/instruments/metclick.pat similarity index 100% rename from android/app/src/main/assets/instruments/metclick.pat rename to files/timidity/instruments/metclick.pat diff --git a/android/app/src/main/assets/instruments/nyguitar.pat b/files/timidity/instruments/nyguitar.pat similarity index 100% rename from android/app/src/main/assets/instruments/nyguitar.pat rename to files/timidity/instruments/nyguitar.pat diff --git a/android/app/src/main/assets/instruments/oboe.pat b/files/timidity/instruments/oboe.pat similarity index 100% rename from android/app/src/main/assets/instruments/oboe.pat rename to files/timidity/instruments/oboe.pat diff --git a/android/app/src/main/assets/instruments/piccolo.pat b/files/timidity/instruments/piccolo.pat similarity index 100% rename from android/app/src/main/assets/instruments/piccolo.pat rename to files/timidity/instruments/piccolo.pat diff --git a/android/app/src/main/assets/instruments/pizzcato.pat b/files/timidity/instruments/pizzcato.pat similarity index 100% rename from android/app/src/main/assets/instruments/pizzcato.pat rename to files/timidity/instruments/pizzcato.pat diff --git a/android/app/src/main/assets/instruments/scratch1.pat b/files/timidity/instruments/scratch1.pat similarity index 100% rename from android/app/src/main/assets/instruments/scratch1.pat rename to files/timidity/instruments/scratch1.pat diff --git a/android/app/src/main/assets/instruments/scratch2.pat b/files/timidity/instruments/scratch2.pat similarity index 100% rename from android/app/src/main/assets/instruments/scratch2.pat rename to files/timidity/instruments/scratch2.pat diff --git a/android/app/src/main/assets/instruments/shaker.pat b/files/timidity/instruments/shaker.pat similarity index 100% rename from android/app/src/main/assets/instruments/shaker.pat rename to files/timidity/instruments/shaker.pat diff --git a/android/app/src/main/assets/instruments/slap.pat b/files/timidity/instruments/slap.pat similarity index 100% rename from android/app/src/main/assets/instruments/slap.pat rename to files/timidity/instruments/slap.pat diff --git a/android/app/src/main/assets/instruments/slowstr.pat b/files/timidity/instruments/slowstr.pat similarity index 100% rename from android/app/src/main/assets/instruments/slowstr.pat rename to files/timidity/instruments/slowstr.pat diff --git a/android/app/src/main/assets/instruments/snap.pat b/files/timidity/instruments/snap.pat similarity index 100% rename from android/app/src/main/assets/instruments/snap.pat rename to files/timidity/instruments/snap.pat diff --git a/android/app/src/main/assets/instruments/snare1.pat b/files/timidity/instruments/snare1.pat similarity index 100% rename from android/app/src/main/assets/instruments/snare1.pat rename to files/timidity/instruments/snare1.pat diff --git a/android/app/src/main/assets/instruments/snare2.pat b/files/timidity/instruments/snare2.pat similarity index 100% rename from android/app/src/main/assets/instruments/snare2.pat rename to files/timidity/instruments/snare2.pat diff --git a/android/app/src/main/assets/instruments/snarerol.pat b/files/timidity/instruments/snarerol.pat similarity index 100% rename from android/app/src/main/assets/instruments/snarerol.pat rename to files/timidity/instruments/snarerol.pat diff --git a/android/app/src/main/assets/instruments/sqrclick.pat b/files/timidity/instruments/sqrclick.pat similarity index 100% rename from android/app/src/main/assets/instruments/sqrclick.pat rename to files/timidity/instruments/sqrclick.pat diff --git a/android/app/src/main/assets/instruments/stickrim.pat b/files/timidity/instruments/stickrim.pat similarity index 100% rename from android/app/src/main/assets/instruments/stickrim.pat rename to files/timidity/instruments/stickrim.pat diff --git a/android/app/src/main/assets/instruments/sticks.pat b/files/timidity/instruments/sticks.pat similarity index 100% rename from android/app/src/main/assets/instruments/sticks.pat rename to files/timidity/instruments/sticks.pat diff --git a/android/app/src/main/assets/instruments/surdo1.pat b/files/timidity/instruments/surdo1.pat similarity index 100% rename from android/app/src/main/assets/instruments/surdo1.pat rename to files/timidity/instruments/surdo1.pat diff --git a/android/app/src/main/assets/instruments/surdo2.pat b/files/timidity/instruments/surdo2.pat similarity index 100% rename from android/app/src/main/assets/instruments/surdo2.pat rename to files/timidity/instruments/surdo2.pat diff --git a/android/app/src/main/assets/instruments/synstr2.pat b/files/timidity/instruments/synstr2.pat similarity index 100% rename from android/app/src/main/assets/instruments/synstr2.pat rename to files/timidity/instruments/synstr2.pat diff --git a/android/app/src/main/assets/instruments/taiko.pat b/files/timidity/instruments/taiko.pat similarity index 100% rename from android/app/src/main/assets/instruments/taiko.pat rename to files/timidity/instruments/taiko.pat diff --git a/android/app/src/main/assets/instruments/tamborin.pat b/files/timidity/instruments/tamborin.pat similarity index 100% rename from android/app/src/main/assets/instruments/tamborin.pat rename to files/timidity/instruments/tamborin.pat diff --git a/android/app/src/main/assets/instruments/timbaleh.pat b/files/timidity/instruments/timbaleh.pat similarity index 100% rename from android/app/src/main/assets/instruments/timbaleh.pat rename to files/timidity/instruments/timbaleh.pat diff --git a/android/app/src/main/assets/instruments/timbalel.pat b/files/timidity/instruments/timbalel.pat similarity index 100% rename from android/app/src/main/assets/instruments/timbalel.pat rename to files/timidity/instruments/timbalel.pat diff --git a/android/app/src/main/assets/instruments/timpani.pat b/files/timidity/instruments/timpani.pat similarity index 100% rename from android/app/src/main/assets/instruments/timpani.pat rename to files/timidity/instruments/timpani.pat diff --git a/android/app/src/main/assets/instruments/tomhi1.pat b/files/timidity/instruments/tomhi1.pat similarity index 100% rename from android/app/src/main/assets/instruments/tomhi1.pat rename to files/timidity/instruments/tomhi1.pat diff --git a/android/app/src/main/assets/instruments/tomhi2.pat b/files/timidity/instruments/tomhi2.pat similarity index 100% rename from android/app/src/main/assets/instruments/tomhi2.pat rename to files/timidity/instruments/tomhi2.pat diff --git a/android/app/src/main/assets/instruments/tomlo1.pat b/files/timidity/instruments/tomlo1.pat similarity index 100% rename from android/app/src/main/assets/instruments/tomlo1.pat rename to files/timidity/instruments/tomlo1.pat diff --git a/android/app/src/main/assets/instruments/tomlo2.pat b/files/timidity/instruments/tomlo2.pat similarity index 100% rename from android/app/src/main/assets/instruments/tomlo2.pat rename to files/timidity/instruments/tomlo2.pat diff --git a/android/app/src/main/assets/instruments/tommid1.pat b/files/timidity/instruments/tommid1.pat similarity index 100% rename from android/app/src/main/assets/instruments/tommid1.pat rename to files/timidity/instruments/tommid1.pat diff --git a/android/app/src/main/assets/instruments/tommid2.pat b/files/timidity/instruments/tommid2.pat similarity index 100% rename from android/app/src/main/assets/instruments/tommid2.pat rename to files/timidity/instruments/tommid2.pat diff --git a/android/app/src/main/assets/instruments/tremstr.pat b/files/timidity/instruments/tremstr.pat similarity index 100% rename from android/app/src/main/assets/instruments/tremstr.pat rename to files/timidity/instruments/tremstr.pat diff --git a/android/app/src/main/assets/instruments/triangl1.pat b/files/timidity/instruments/triangl1.pat similarity index 100% rename from android/app/src/main/assets/instruments/triangl1.pat rename to files/timidity/instruments/triangl1.pat diff --git a/android/app/src/main/assets/instruments/triangl2.pat b/files/timidity/instruments/triangl2.pat similarity index 100% rename from android/app/src/main/assets/instruments/triangl2.pat rename to files/timidity/instruments/triangl2.pat diff --git a/android/app/src/main/assets/instruments/trombone.pat b/files/timidity/instruments/trombone.pat similarity index 100% rename from android/app/src/main/assets/instruments/trombone.pat rename to files/timidity/instruments/trombone.pat diff --git a/android/app/src/main/assets/instruments/vibslap.pat b/files/timidity/instruments/vibslap.pat similarity index 100% rename from android/app/src/main/assets/instruments/vibslap.pat rename to files/timidity/instruments/vibslap.pat diff --git a/android/app/src/main/assets/instruments/viola.pat b/files/timidity/instruments/viola.pat similarity index 100% rename from android/app/src/main/assets/instruments/viola.pat rename to files/timidity/instruments/viola.pat diff --git a/android/app/src/main/assets/instruments/whistle1.pat b/files/timidity/instruments/whistle1.pat similarity index 100% rename from android/app/src/main/assets/instruments/whistle1.pat rename to files/timidity/instruments/whistle1.pat diff --git a/android/app/src/main/assets/instruments/whistle2.pat b/files/timidity/instruments/whistle2.pat similarity index 100% rename from android/app/src/main/assets/instruments/whistle2.pat rename to files/timidity/instruments/whistle2.pat diff --git a/android/app/src/main/assets/instruments/woodblk1.pat b/files/timidity/instruments/woodblk1.pat similarity index 100% rename from android/app/src/main/assets/instruments/woodblk1.pat rename to files/timidity/instruments/woodblk1.pat diff --git a/android/app/src/main/assets/instruments/woodblk2.pat b/files/timidity/instruments/woodblk2.pat similarity index 100% rename from android/app/src/main/assets/instruments/woodblk2.pat rename to files/timidity/instruments/woodblk2.pat diff --git a/android/app/src/main/assets/timidity.cfg b/files/timidity/timidity.cfg similarity index 100% rename from android/app/src/main/assets/timidity.cfg rename to files/timidity/timidity.cfg diff --git a/src/dist/Makefile.emscripten b/src/dist/Makefile.emscripten index 8e3b0c7c252..98e74871f08 100644 --- a/src/dist/Makefile.emscripten +++ b/src/dist/Makefile.emscripten @@ -27,12 +27,13 @@ CCFLAGS := $(filter-out -pthread,$(CCFLAGS)) \ LDFLAGS := $(filter-out -pthread,$(LDFLAGS)) \ --preload-file ../../../files/data/resurrection.h2d@/files/data/resurrection.h2d \ --preload-file ../../../files/lang/@/files/lang/ \ - --preload-file ../../../files/soundfonts/fheroes2.sf3@/files/soundfonts/fheroes2.sf3 \ + --preload-file ../../../files/timidity/@/etc/ \ -sASYNCIFY \ -sASYNCIFY_STACK_SIZE=20480 \ -sENVIRONMENT=web \ -sINITIAL_MEMORY=128mb \ -sNO_DISABLE_EXCEPTION_CATCHING \ + -sSDL2_MIXER_FORMATS=mid,mp3,ogg \ -sSTACK_SIZE=262144 \ -lidbfs.js