project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java
--- a/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java Sat Dec 07 16:14:27 2019 +0100
+++ b/project_files/Android-build/SDL-android-project/src/org/hedgewars/hedgeroid/EngineProtocol/PascalExports.java Sat Dec 07 16:18:20 2019 +0100
@@ -23,17 +23,30 @@
public class PascalExports {
public static Object engineMutex = new Object();
+ protected final static String[] libs = {
+ "SDL2",
+ "SDL2_image",
+ "mikmod",
+ "SDL2_net",
+ "SDL2_mixer",
+ "SDL2_ttf",
+ "lua",
+ "physfs",
+ "physlayer",
+ "hwengine",
+ };
+
static{
- System.loadLibrary("SDL");
- System.loadLibrary("SDL_image");
- System.loadLibrary("mikmod");
- System.loadLibrary("SDL_net");
- System.loadLibrary("SDL_mixer");
- System.loadLibrary("SDL_ttf");
- System.loadLibrary("lua5.1");
- System.loadLibrary("physfs");
- System.loadLibrary("physlayer");
- System.loadLibrary("hwengine");
+ for (String l : libs) {
+ try {
+ android.util.Log.d("org.hedgewars.hedgeroid.EngineProtocol.PascalExports", "Hedgewars (class PascalExports) is attempting to load library '" + l + "' ...");
+ System.loadLibrary(l);
+ android.util.Log.d("org.hedgewars.hedgeroid.EngineProtocol.PascalExports", "Hedgewars (class PascalExports) successfully loaded library '" + l + "'.");
+ } catch (Exception ex) {
+ android.util.Log.e("org.hedgewars.hedgeroid.EngineProtocol.PascalExports", "Hedgewars (class PascalExports) failed to load library '" + l + "':" + ex.getMessage());
+ throw ex;
+ }
+ }
}
public static native int HWgetMaxNumberOfTeams();