diff --git a/project/javaSDL2/MainActivity.java b/project/javaSDL2/MainActivity.java index 1e8a60b61..a0d4b6553 100644 --- a/project/javaSDL2/MainActivity.java +++ b/project/javaSDL2/MainActivity.java @@ -42,7 +42,6 @@ public class MainActivity extends org.libsdl.app.SDLActivity { Globals.DataDir = this.getFilesDir().getAbsolutePath(); Settings.LoadConfig(this); // Load Globals.DataDir from SDL 1.2 installation, we never save config file - Log.i("SDL", "Checking for asset pack"); try { if( android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.LOLLIPOP ) @@ -68,25 +67,34 @@ public class MainActivity extends org.libsdl.app.SDLActivity { } Settings.setEnvVars(this); + Settings.nativeChdir(Globals.DataDir); } public void downloadFinishedInitSDL() { // TODO: implement this } + @Override + protected void pauseNativeThread() { + Log.i("SDL", "Intercepted pauseNativeThread() from MainActivity"); + super.pauseNativeThread(); + } + @Override protected void resumeNativeThread() { Log.i("SDL", "Intercepted resumeNativeThread() from MainActivity"); super.resumeNativeThread(); } - @Override protected String[] getLibraries() { ArrayList ret = new ArrayList(); for (String l: Globals.AppLibraries) { ret.add(GetMappedLibraryName(l)); } + for (String l: Globals.AppMainLibraries) { + ret.add(GetMappedLibraryName(l)); + } return ret.toArray(new String[0]); } @@ -100,6 +108,7 @@ public class MainActivity extends org.libsdl.app.SDLActivity { if (Globals.LibraryNamesMap[i][0].equals(s)) return Globals.LibraryNamesMap[i][1]; } + Log.v("SDL", "Loading native libraries: " + String.join(" ", ret)); return s; }