From 9f97bccd1086996a3d9f541317c5c26c98fa9f15 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 7 Jun 2010 17:20:50 +0300
Subject: [PATCH] Support for initializing video/audio in static constructors
 before main()

---
 alienblaster/project/src/Globals.java | 6 ++----
 alienblaster/project/src/Video.java   | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/alienblaster/project/src/Globals.java b/alienblaster/project/src/Globals.java
index 726e21b2a..f88ab2269 100644
--- a/alienblaster/project/src/Globals.java
+++ b/alienblaster/project/src/Globals.java
@@ -21,14 +21,12 @@ class Globals {
 }
 
 class LoadLibrary {
-	public LoadLibrary() {}
-	static {
+	public LoadLibrary()
+	{
 		System.loadLibrary("tremor");
 		System.loadLibrary("sdl");
 		System.loadLibrary("sdl_mixer");
 		System.loadLibrary("sdl_image");
 		System.loadLibrary("sdl_ttf");
-		System.loadLibrary("application");
-		System.loadLibrary("sdl_main");
 	}
 }
diff --git a/alienblaster/project/src/Video.java b/alienblaster/project/src/Video.java
index 2b1d5b473..6a589985c 100644
--- a/alienblaster/project/src/Video.java
+++ b/alienblaster/project/src/Video.java
@@ -40,6 +40,9 @@ class DemoRenderer extends GLSurfaceView_SDL.Renderer {
 	public void onDrawFrame(GL10 gl) {
 
 		nativeInitJavaCallbacks();
+		
+		System.loadLibrary("application");
+		System.loadLibrary("sdl_main");
 
 		nativeInit(); // Calls main() and never returns, hehe - we'll call eglSwapBuffers() from native code