diff --git a/alienblaster/AppSettings.cfg b/alienblaster/AppSettings.cfg index 9e5975087..5fb22ba29 100644 --- a/alienblaster/AppSettings.cfg +++ b/alienblaster/AppSettings.cfg @@ -5,6 +5,6 @@ AppDataDownloadUrl="http://sites.google.com/site/xpelyax/Home/alienblaster110_da DownloadToSdcard=n SdlVideoResize=a NeedDepthBuffer=n -MultiABI=y -CompiledLibraries="mad sdl_mixer sdl_image sdl_ttf" +MultiABI=n +CompiledLibraries="sdl_mixer sdl_image" ReadmeText='^Use accelerometer to navigate menus and control ship^Press "Menu" to select menu and for secondary fire^Press "Call" or touch screen for primary fire^Press "Volume Up/Down" to cycle through weapons' diff --git a/alienblaster/project/jni/Android.mk b/alienblaster/project/jni/Android.mk index 3bf91ac11..75a001f7d 100644 --- a/alienblaster/project/jni/Android.mk +++ b/alienblaster/project/jni/Android.mk @@ -23,7 +23,7 @@ SDL_TRACKBALL_KEYUP_DELAY := 1 # resized in HW-accelerated way, however it eats a tiny bit of CPU SDL_VIDEO_RENDER_RESIZE := 2 -COMPILED_LIBRARIES := mad sdl_mixer sdl_image sdl_ttf +COMPILED_LIBRARIES := sdl_mixer sdl_image # If SDL_Mixer should link to libMAD SDL_MIXER_USE_LIBMAD := diff --git a/alienblaster/project/jni/Application.mk b/alienblaster/project/jni/Application.mk index 20cb3e0e8..2c18e9ef4 100644 --- a/alienblaster/project/jni/Application.mk +++ b/alienblaster/project/jni/Application.mk @@ -5,6 +5,6 @@ APP_PROJECT_PATH := $(call my-dir)/.. # sdl_image depends on png and jpeg # sdl_ttf depends on freetype -APP_MODULES := application sdl_main stlport tremor png jpeg freetype mad sdl_mixer sdl_image sdl_ttf +APP_MODULES := application sdl_main stlport tremor png jpeg freetype sdl_mixer sdl_image -APP_ABI := armeabi armeabi-v7a +APP_ABI := armeabi diff --git a/alienblaster/project/src/Globals.java b/alienblaster/project/src/Globals.java index 4064c8a06..ee6e68796 100644 --- a/alienblaster/project/src/Globals.java +++ b/alienblaster/project/src/Globals.java @@ -24,5 +24,5 @@ class Globals { } class LoadLibrary { - public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("mad"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); }; + public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); }; }