games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-15 01:24:45 +02:00
Code Issues Releases Activity

adjust project for Android (except AI)

Browse Source
This commit is contained in:
Andrey Filipenkov
2023-02-25 10:15:09 +03:00
parent 5ba3a9a5fa
commit 970bd6ed34
16 changed files with 127 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/vcmi-app/src/main/java/eu/vcmi/vcmi/VcmiSDLActivity.java
View File

@ -80,7 +80,7 @@ public class VcmiSDLActivity extends SDLActivity
@Override
protected String getMainSharedObject() {
String library = "libvcmi-client.so";
String library = "libvcmiclient.so";
return getContext().getApplicationInfo().nativeLibraryDir + "/" + library;
}

4
android/vcmi-app/src/main/java/eu/vcmi/vcmi/util/LibsLoader.java
View File

@ -52,7 +52,7 @@ public final class LibsLoader
public static void loadClientLibs(Context ctx)
{
loadCommon();
loadLib("vcmi-client", false);
loadLib("vcmiclient", false);
SDL.setContext(ctx);
NativeMethods.clientSetupJNI();
NativeMethods.initClassloader();
@ -61,7 +61,7 @@ public final class LibsLoader
public static void loadServerLibs()
{
loadCommon();
loadLib("vcmi-server", false);
loadLib("vcmiserver", false);
NativeMethods.initClassloader();
}
}

9
android/vcmi-app/src/main/java/org/libsdl/app/SDLActivity.java
View File

@ -243,9 +243,7 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
* It can be overridden by derived classes.
*/
protected String getMainSharedObject() {
String library = "libvcmi-client.so";
return getContext().getApplicationInfo().nativeLibraryDir + "/" + library;
return null;
}
/**
@ -265,13 +263,14 @@ public class SDLActivity extends Activity implements View.OnSystemUiVisibilityCh
* @return names of shared libraries to be loaded (e.g. "SDL2", "main").
*/
protected String[] getLibraries() {
// SDL is linked statically, no need to load anything
return new String[] {
"SDL2",
// "SDL2",
// "SDL2_image",
// "SDL2_mixer",
// "SDL2_net",
// "SDL2_ttf",
"main"
// "main"
};
}