Page MenuHomePhabricator (Chris)
Files F135119

No OneTemporary
Actions

Authored By
Unknown
Size
4 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/util/android/install.sh b/util/android/install.sh
index 4434270e..1e19e162 100755
--- a/util/android/install.sh
+++ b/util/android/install.sh
@@ -1,33 +1,33 @@
#!/bin/bash
adb=/opt/android-sdk/platform-tools/adb
run='am start -a android.intent.action.MAIN -n org.paintown/org.paintown.PaintownActivity'
build_paintown(){
- # (cd ../../..; android=1 make) && cp ../../../paintown libs/armeabi/libpaintown.so
+ (cd ../../..; android=1 make)
#echo skip
echo 0
}
build_apk(){
ant debug
}
install_apk(){
# echo "Uninstalling old version"
# $adb uninstall org.libsdl.app
echo "Installing latest version"
$adb install -r bin/Paintown-debug.apk
}
run_apk(){
$adb shell $run
}
echo "Making sure you are running the emulator"
state=$($adb get-state)
if [ $state = "unknown" ]; then
echo "Emulator is not running please start."
else
build_paintown && build_apk && install_apk && run_apk
fi
diff --git a/util/android/src/org/paintown/PaintownActivity.java b/util/android/src/org/paintown/PaintownActivity.java
index 664bcde3..d7c82440 100644
--- a/util/android/src/org/paintown/PaintownActivity.java
+++ b/util/android/src/org/paintown/PaintownActivity.java
@@ -1,84 +1,92 @@
package org.paintown;
import android.app.Activity;
import android.os.Bundle;
import android.os.Handler;
import android.os.Environment;
import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.Surface;
import android.view.SurfaceView;
import android.view.SurfaceHolder;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.view.OrientationEventListener;
import android.view.WindowManager;
import android.hardware.*;
import android.content.res.Configuration;
import android.content.res.AssetManager;
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.PixelFormat;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.content.pm.ActivityInfo;
import android.util.Log;
import java.lang.String;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.InvocationTargetException;
import java.lang.Runnable;
import java.util.List;
import java.util.BitSet;
import java.util.ArrayList;
import java.io.File;
import java.io.InputStream;
import java.io.FileOutputStream;
import java.nio.ByteBuffer;
import javax.microedition.khronos.egl.EGLConfig;
import javax.microedition.khronos.opengles.GL10;
import javax.microedition.khronos.egl.*;
import org.liballeg.app.AllegroActivity;
import android.media.AudioManager;
public class PaintownActivity extends AllegroActivity {
- /* load allegro */
- static {
- /* FIXME: see if we can't load the allegro library name, or type from the manifest here */
- System.loadLibrary("OpenSLES");
- /*
- System.loadLibrary("allegro");
- System.loadLibrary("allegro_primitives");
- System.loadLibrary("allegro_image");
- System.loadLibrary("allegro_memfile");
- System.loadLibrary("allegro_font");
- System.loadLibrary("allegro_ttf");
- System.loadLibrary("allegro_audio");
- System.loadLibrary("allegro_acodec");
- */
+ static void loadAllegroLibraries(String suffix){
+ System.loadLibrary("allegro" + suffix);
+ System.loadLibrary("allegro_primitives" + suffix);
+ System.loadLibrary("allegro_image" + suffix);
+ System.loadLibrary("allegro_memfile" + suffix);
+ System.loadLibrary("allegro_font" + suffix);
+ System.loadLibrary("allegro_ttf" + suffix);
+ System.loadLibrary("allegro_audio" + suffix);
+ System.loadLibrary("allegro_acodec" + suffix);
+ }
+
+ static void loadAllegroNormal(){
+ loadAllegroLibraries("");
+ }
+
+ static void loadAllegroDebug(){
+ loadAllegroLibraries("-debug");
+ }
- System.loadLibrary("allegro-debug");
- System.loadLibrary("allegro_primitives-debug");
- System.loadLibrary("allegro_image-debug");
- System.loadLibrary("allegro_memfile-debug");
- System.loadLibrary("allegro_font-debug");
- System.loadLibrary("allegro_ttf-debug");
- System.loadLibrary("allegro_audio-debug");
- System.loadLibrary("allegro_acodec-debug");
+ static void loadAllegro(){
+ try{
+ loadAllegroNormal();
+ } catch (UnsatisfiedLinkError fail){
+ loadAllegroDebug();
+ }
+ }
+
+ /* load allegro */
+ static {
+ System.loadLibrary("OpenSLES");
+ loadAllegro();
System.loadLibrary("paintown");
}
public PaintownActivity(){
}
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Jun 20, 8:01 PM (1 w, 1 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
72952
Default Alt Text
(4 KB)

Event Timeline