android: explicitly load libcrystax

[d2df-sdl.git] / android / src / org / d2df / app / Doom2DF.java

diff --git a/android/src/org/d2df/app/Doom2DF.java b/android/src/org/d2df/app/Doom2DF.java
index ca1766609ac4b4a689bca384dba7db7d0a530ff8..05a1f4ab0f6b1943dfd9a3ab7cb594cf59d1c283 100644 (file)
--- a/android/src/org/d2df/app/Doom2DF.java
+++ b/android/src/org/d2df/app/Doom2DF.java
@@ -11,11 +11,11 @@ public class Doom2DF extends SDLActivity {
        @Override
        protected String[] getLibraries() {
                return new String[] {
+                       "crystax",
                        "SDL2",
                        "mpg123",
                        "SDL2_mixer",
                        "enet",
-                       "nanoGL",
                        "Doom2DF"
                };
        }
@@ -23,11 +23,22 @@ public class Doom2DF extends SDLActivity {
        @Override
        protected void onCreate(Bundle savedInstanceState) {
                super.onCreate(savedInstanceState);
+
                CopyAssets.copyAssets(SDL.getContext(), "");
                CopyAssets.copyAssets(SDL.getContext(), "data");
                CopyAssets.copyAssets(SDL.getContext(), "data/models");
                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");
+       }
+
+       @Override
+       protected void onDestroy() {
+               super.onDestroy();
+
+               /* This will fix bug #31 and may be #32 */
+               System.exit(0);
        }
 }