Fixed compilation

alienblaster/AppSettings.cfg

@@ -5,5 +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"
 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'

alienblaster/ChangeAppSettings.sh

@@ -45,15 +45,15 @@ if [ -n "$var" ] ; then
 	NeedDepthBuffer="$var"
 fi
 
-echo -n "\nEnable multi-ABI binary, with hardware FPU support (it will also work on old devices, but .apk size is 2x bigger) (y) or (n) ($MultiABI): "
+echo -n "\nEnable multi-ABI binary, with hardware FPU support - \nit will also work on old devices, but .apk size is 2x bigger (y) or (n) ($MultiABI): "
 read var
 if [ -n "$var" ] ; then
 	MultiABI="$var"
 fi
 
 echo -n "\nOptional shared libraries to compile - removing some of them will save space\nMP3 support by libMAD is encumbered by patents and libMAD is GPL-ed\n"
-grep 'Available libraries:' project/Application.mk 
-grep 'depends on' project/Application.mk
+grep 'Available libraries:' project/jni/Application.mk 
+grep 'depends on' project/jni/Application.mk
 echo -n "Current: $CompiledLibraries\n\n: "
 read var
 if [ -n "$var" ] ; then
@@ -123,10 +123,6 @@ if [ "$MultiABI" = "y" ] ; then
 else
 	MultiABI="armeabi"
 fi
-SdlMixerUseLibMad=0
-if echo $CompiledLibraries | grep '\bmad\b' > /dev/null ; then
-	SdlMixerUseLibMad=1
-fi
 LibrariesToLoad="System.loadLibrary(\\\"sdl\\\");"
 for lib in $CompiledLibraries; do
 	LibrariesToLoad="$LibrariesToLoad System.loadLibrary(\\\"$lib\\\");"
@@ -163,22 +159,20 @@ cat project/src/Globals.java | \
 mv -f project/src/Globals.java.1 project/src/Globals.java
 
 echo Patching project/jni/Android.mk
-
-# sed "s^SDL_SHARED_LIBRARIES_PATH := .*^SDL_SHARED_LIBRARIES_PATH := $AppSharedLibrariesPath^" | \
-
 cat project/jni/Android.mk | \
 	sed "s/SDL_JAVA_PACKAGE_PATH := .*/SDL_JAVA_PACKAGE_PATH := $AppFullNameUnderscored/" | \
 	sed "s^SDL_CURDIR_PATH := .*^SDL_CURDIR_PATH := $DataPath^" | \
 	sed "s^SDL_VIDEO_RENDER_RESIZE := .*^SDL_VIDEO_RENDER_RESIZE := $SdlVideoResize^" | \
-	sed "s^SDL_MIXER_USE_LIBMAD := .*^SDL_MIXER_USE_LIBMAD := $SdlMixerUseLibMad^" > \
+	sed "s^COMPILED_LIBRARIES := .*^COMPILED_LIBRARIES := $CompiledLibraries^" > \
 	project/jni/Android.mk.1
 mv -f project/jni/Android.mk.1 project/jni/Android.mk
 
-cat project/Application.mk | \
+echo Patching project/jni/Application.mk
+cat project/jni/Application.mk | \
 	sed "s/APP_MODULES := .*/APP_MODULES := application sdl_main stlport tremor png jpeg freetype $CompiledLibraries/" | \
 	sed "s/APP_ABI := .*/APP_ABI := $MultiABI/" > \
-	project/Application.mk.1
-mv -f project/Application.mk.1 project/Application.mk
+	project/jni/Application.mk.1
+mv -f project/jni/Application.mk.1 project/jni/Application.mk
 
 echo Patching project/res/values/strings.xml
 cat project/res/values/strings.xml | \
@@ -192,6 +186,6 @@ touch project/jni/sdl/src/video/android/*.c
 touch project/jni/sdl/src/video/SDL_video.c
 touch project/jni/sdl/src/video/SDL_renderer_gles.c
 touch project/jni/sdl/src/audio/android/*.c
-rm -f project/libs/armeabi/libapplication.so project/libs/armeabi/libsdl.so project/libs/armeabi/libsdl_main.so
+rm -rf project/libs/*
 
 echo Done

alienblaster/project/jni/Android.mk

@@ -23,7 +23,12 @@ 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
+
 # If SDL_Mixer should link to libMAD
+SDL_MIXER_USE_LIBMAD :=
+ifneq ($(strip $(filter mad, $(COMPILED_LIBRARIES))),)
 SDL_MIXER_USE_LIBMAD := 1
+endif
 
 include $(call all-subdir-makefiles)

alienblaster/project/jni/Application.mk

@@ -1,4 +1,4 @@
-APP_PROJECT_PATH := $(call my-dir)
+APP_PROJECT_PATH := $(call my-dir)/..
 
 # Available libraries: mad sdl_mixer sdl_image sdl_ttf
 # sdl_mixer depends on tremor and optionally mad

alienblaster/project/jni/application/Android.mk

@@ -12,6 +12,7 @@ LOCAL_CFLAGS := $(foreach D, $(APP_SUBDIRS), -I$(LOCAL_PATH)/$(D)) \
 				-I$(LOCAL_PATH)/../sdl/include \
 				-I$(LOCAL_PATH)/../sdl_mixer \
 				-I$(LOCAL_PATH)/../sdl_image \
+				-I$(LOCAL_PATH)/../sdl_ttf \
 				-I$(LOCAL_PATH)/../stlport/stlport \
 
 
@@ -22,11 +23,11 @@ LOCAL_SRC_FILES := $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wil
 # Uncomment to also add C sources
 LOCAL_SRC_FILES += $(foreach F, $(APP_SUBDIRS), $(addprefix $(F)/,$(notdir $(wildcard $(LOCAL_PATH)/$(F)/*.c))))
 
-LOCAL_SHARED_LIBRARIES := sdl sdl_mixer sdl_image tremor sdl_ttf
+LOCAL_SHARED_LIBRARIES := sdl $(COMPILED_LIBRARIES)
 
 LOCAL_STATIC_LIBRARIES := stlport
 
-LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz -lGLESv1_CM
+LOCAL_LDLIBS := -lGLESv1_CM -ldl -llog -lz
 
 LIBS_WITH_LONG_SYMBOLS := $(strip $(shell \
 	for f in $(LOCAL_PATH)/../../libs/armeabi/*.so ; do \