miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SDL: fix for loading libiconv

Browse Source
This commit is contained in:
Sergii Pylypenko
2018-12-05 19:49:59 +02:00
parent 969d785ec1
commit bf0eb74ea8
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/java/MainActivity.java
View File

@@ -1195,6 +1195,7 @@ public class MainActivity extends Activity
File libpath = new File(getFilesDir().getAbsolutePath() + "/../lib/" + libname); File libpath = new File(getFilesDir().getAbsolutePath() + "/../lib/" + libname);
Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath());
System.load(libpath.getPath()); System.load(libpath.getPath());
Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath());
} }
catch( UnsatisfiedLinkError e ) catch( UnsatisfiedLinkError e )
{ {
@@ -1205,11 +1206,13 @@ public class MainActivity extends Activity
File libpath = new File(getFilesDir().getAbsolutePath() + "/" + libname); File libpath = new File(getFilesDir().getAbsolutePath() + "/" + libname);
Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath()); Log.i("SDL", "libSDL: loading lib " + libpath.getAbsolutePath());
System.load(libpath.getPath()); System.load(libpath.getPath());
Log.i("SDL", "libSDL: loaded lib " + libpath.getAbsolutePath());
} }
catch( UnsatisfiedLinkError ee ) catch( UnsatisfiedLinkError ee )
{ {
Log.i("SDL", "libSDL: error loading lib " + l + ": " + ee.toString()); Log.i("SDL", "libSDL: error loading lib " + l + ": " + ee.toString());
System.loadLibrary(l); System.loadLibrary(l);
Log.i("SDL", "libSDL: loaded lib " + l + " from app lib path");
} }
} }
} }

2
project/jni/application/ballfield/AndroidAppSettings.cfg
View File

@@ -269,7 +269,7 @@ APP_PLATFORM=
# Specify architectures to compile, 'all' or 'y' to compile for all architectures. # Specify architectures to compile, 'all' or 'y' to compile for all architectures.
# Available architectures: armeabi-v7a x86 arm64-v8a x86_64 # Available architectures: armeabi-v7a x86 arm64-v8a x86_64
MultiABI='armeabi-v7a arm64-v8a x86 x86_64' MultiABI='arm64-v8a' # armeabi-v7a x86 x86_64
# Optional shared libraries to compile - removing some of them will save space # Optional shared libraries to compile - removing some of them will save space
# MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed # MP3 support by libMAD is encumbered by patents and libMAD is GPL-ed

2
project/jni/iconv/src

Submodule project/jni/iconv/src updated: 77c9e6c31e...3265ce98ed