mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-23 22:37:55 +02:00
adjust project for Android (except AI)
This commit is contained in:
7
android/vcmi-app/.gitignore
vendored
7
android/vcmi-app/.gitignore
vendored
@@ -1 +1,8 @@
|
||||
/build
|
||||
|
||||
# generated by CMake build
|
||||
/src/main/assets/internalData.zip
|
||||
/src/main/assets/internalDataHash.txt
|
||||
/src/main/java/eu/vcmi/vcmi/util/GeneratedVersion.java
|
||||
/src/main/jniLibs
|
||||
/src/main/res/raw/authors.txt
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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"
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user