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

SDL: renamed libcrypto and libssl to avoid clashing with system libraries, fixed crashes in SD card Java code

Browse Source
This commit is contained in:
Sergii Pylypenko
2016-06-10 19:43:32 +03:00
parent 90cc2821a6
commit cbd8374185
11 changed files with 56 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
project/java/MainActivity.java
View File

@@ -1241,8 +1241,9 @@ public class MainActivity extends Activity
// Load all libraries
try
{
for(String l : Globals.AppLibraries)
for(String l_unmapped : Globals.AppLibraries)
{
String l = GetMappedLibraryName(l_unmapped);
try
{
String libname = System.mapLibraryName(l);
@@ -1342,8 +1343,9 @@ public class MainActivity extends Activity
out.close();
}
for(String l : Globals.AppLibraries)
for(String l_unmapped : Globals.AppLibraries)
{
String l = GetMappedLibraryName(l_unmapped);
String libname = System.mapLibraryName(l);
File libpath = new File(libDir, libname);
Log.i("SDL", "libSDL: loading lib " + libpath.getPath());
@@ -1467,10 +1469,20 @@ public class MainActivity extends Activity
}
};
public static String GetMappedLibraryName(final String s)
{
for (int i = 0; i < Globals.LibraryNamesMap.length; i++)
{
if( Globals.LibraryNamesMap[i][0].equals(s) )
return Globals.LibraryNamesMap[i][1];
}
return s;
}
public static void LoadApplicationLibrary(final Context context)
{
Settings.nativeChdir(Globals.DataDir);
for(String l : Globals.AppMainLibraries)
for(String l: Globals.AppMainLibraries)
{
try
{