project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java
branchhedgeroid
changeset 15512 45d6806548e9
parent 11046 47a8c19ecb60
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Sat Dec 07 16:14:27 2019 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/SDLActivity.java	Sat Dec 07 16:18:20 2019 +0100
@@ -87,9 +87,22 @@
     private static int mGLMajor, mGLMinor;
 
     // Load the .so
-    static {
-        System.loadLibrary("SDL");
-        System.loadLibrary("main");
+    protected final static String[] libs = {
+        "SDL2",
+        "main",
+    };
+
+    static{
+        for (String l : libs) {
+            try {
+                android.util.Log.d("org.hedgewars.hedgeroid.SDLActivity", "Hedgewars (class SDLActivity) is attempting to load library '" + l + "' ...");
+                System.loadLibrary(l);
+                android.util.Log.d("org.hedgewars.hedgeroid.SDLActivity", "Hedgewars (class SDLActivity) successfully loaded library '" + l + "'.");
+            } catch (Exception ex) {
+                android.util.Log.e("org.hedgewars.hedgeroid.SDLActivity", "Hedgewars (class SDLActivity) failed to load library '" + l + "':" + ex.getMessage());
+                throw ex;
+            }
+        }
     }
 
     // Setup