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

Fixed ndk-gdb not showing symbols in libapplication.so

Browse Source
This commit is contained in:
pelya
2012-02-28 17:55:25 +02:00
parent 996291e118
commit 2185044162
7 changed files with 93 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
project/java/Globals.java
View File

@@ -37,7 +37,8 @@ class Globals {
public static boolean NeedDepthBuffer = false;
public static boolean NeedStencilBuffer = false;
public static boolean NeedGles2 = false;
public static boolean CompatibilityHacks = false;
public static boolean CompatibilityHacksVideo = false;
public static boolean CompatibilityHacksStaticInit = false;
public static boolean HorizontalOrientation = true;
public static boolean InhibitSuspend = false;
public static String ReadmeText = "^You may press \"Home\" now - the data will be downloaded in background".replace("^","\n");

34
project/java/MainActivity.java
View File

@@ -135,6 +135,8 @@ public class MainActivity extends Activity {
mAudioThread = new AudioThread(this);
System.out.println("libSDL: Loading settings");
Settings.Load(this);
if(!Globals.CompatibilityHacksStaticInit)
LoadApplicationLibrary(this);
}
if( !Settings.settingsChanged )
@@ -224,6 +226,7 @@ public class MainActivity extends Activity {
mGLView.setFocusable(true);
mGLView.requestFocus();
DimSystemStatusBar.get().dim(_videoLayout);
DimSystemStatusBar.get().dim(mGLView);
}
@Override
@@ -683,6 +686,37 @@ public class MainActivity extends Activity {
};
public static void LoadApplicationLibrary(final Context context)
{
String libs[] = { "application", "sdl_main" };
try
{
for(String l : libs)
{
System.loadLibrary(l);
}
}
catch ( UnsatisfiedLinkError e )
{
System.out.println("libSDL: error loading lib: " + e.toString());
try
{
for(String l : libs)
{
String libname = System.mapLibraryName(l);
File libpath = new File(context.getCacheDir(), libname);
System.out.println("libSDL: loading lib " + libpath.getPath());
System.load(libpath.getPath());
libpath.delete();
}
}
catch ( UnsatisfiedLinkError ee )
{
System.out.println("libSDL: error loading lib: " + ee.toString());
}
}
}
public int getApplicationVersion()
{
try {

4
project/java/Settings.java
View File

@@ -2359,7 +2359,7 @@ class Settings
Globals.SmoothVideo
};
if(Globals.SwVideoMode && !Globals.CompatibilityHacks)
if(Globals.SwVideoMode && !Globals.CompatibilityHacksVideo)
{
CharSequence[] items2 = {
p.getResources().getString(R.string.pointandclick_keepaspectratio),
@@ -2454,7 +2454,7 @@ class Settings
nativeSetVideoDepth(Globals.VideoDepthBpp, Globals.NeedGles2 ? 1 : 0);
if(Globals.SmoothVideo)
nativeSetSmoothVideo();
if( Globals.CompatibilityHacks )
if( Globals.CompatibilityHacksVideo )
{
Globals.MultiThreadedVideo = true;
Globals.SwVideoMode = true;

31
project/java/Video.java
View File

@@ -389,33 +389,8 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
mGlContextLost = false;
String libs[] = { "application", "sdl_main" };
try
{
for(String l : libs)
{
System.loadLibrary(l);
}
}
catch ( UnsatisfiedLinkError e )
{
System.out.println("libSDL: error loading lib: " + e.toString());
try
{
for(String l : libs)
{
String libname = System.mapLibraryName(l);
File libpath = new File(context.getCacheDir(), libname);
System.out.println("libSDL: loading lib " + libpath.getPath());
System.load(libpath.getPath());
libpath.delete();
}
}
catch ( UnsatisfiedLinkError ee )
{
System.out.println("libSDL: error loading lib: " + ee.toString());
}
}
if(Globals.CompatibilityHacksStaticInit)
MainActivity.LoadApplicationLibrary(context);
Settings.Apply(context);
DifferentTouchInput.ExternalMouseDetected = false;
@@ -426,7 +401,7 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer
// Calls main() and never returns, hehe - we'll call eglSwapBuffers() from native code
nativeInit( Globals.DataDir,
Globals.CommandLine,
( (Globals.SwVideoMode && Globals.MultiThreadedVideo) || Globals.CompatibilityHacks ) ? 1 : 0 );
( (Globals.SwVideoMode && Globals.MultiThreadedVideo) || Globals.CompatibilityHacksVideo ) ? 1 : 0 );
System.exit(0); // The main() returns here - I don't bother with deinit stuff, just terminate process
}