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

Added multi-ABI support to ChangeAppSettings.sh, fixed libMAD compilation

Browse Source
This commit is contained in:
pelya
2010-07-08 17:47:54 +03:00
parent 9fdddca0ec
commit 650aca4a3d
7 changed files with 41 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
alienblaster/project/Application.mk
View File

@@ -1,8 +1,10 @@
APP_PROJECT_PATH := $(call my-dir)
# Available libraries: stlport sdl sdl_mixer tremor mad sdl_image png jpeg sdl_ttf freetype
# Available libraries: mad sdl_mixer sdl_image sdl_ttf
# sdl_mixer depends on tremor and optionally mad
# sdl_image depends on png and jpeg
# sdl_ttf depends on freetype
APP_MODULES := application sdl_main sdl sdl_mixer tremor mad sdl_image png jpeg sdl_ttf freetype
APP_MODULES := application sdl_main stlport tremor png jpeg freetype mad sdl_mixer sdl_image sdl_ttf
APP_ABI := armeabi armeabi-v7a

3
alienblaster/project/jni/mad/Android.mk
View File

@@ -5,7 +5,8 @@ include $(CLEAR_VARS)
LOCAL_MODULE := mad
LOCAL_CFLAGS := -I$(LOCAL_PATH) \
-DOPT_SPEED -DSTDC_HEADERS -DHAVE_UNISTD_H \
-DFPM_64BIT -DOPT_SPEED \
-DSTDC_HEADERS -DHAVE_UNISTD_H \
-DSIZEOF_INT=4 -DSIZEOF_LONG=4 -DSIZEOF_LONG_LONG=8 \
-DHAVE_ASSERT_H -DHAVE_ERRNO_H -DHAVE_FCNTL_H -DHAVE_INTTYPES_H \
-DHAVE_LIMITS_H -DHAVE_MEMORY_H -DHAVE_STDINT_H -DHAVE_STDLIB_H \

7
alienblaster/project/jni/sdl_mixer/Android.mk
View File

@@ -4,17 +4,18 @@ include $(CLEAR_VARS)
LOCAL_MODULE := sdl_mixer
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl/include \
LOCAL_CFLAGS := -I$(LOCAL_PATH) -I$(LOCAL_PATH)/.. -I$(LOCAL_PATH)/../sdl/include -I$(LOCAL_PATH)/../mad \
-DWAV_MUSIC -DOGG_USE_TREMOR -DOGG_MUSIC
LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
LOCAL_SHARED_LIBRARIES := sdl tremor
LOCAL_SHARED_LIBRARIES := sdl
LOCAL_STATIC_LIBRARIES := tremor
ifneq ($(SDL_MIXER_USE_LIBMAD),)
LOCAL_CFLAGS := -DMP3_MAD_MUSIC
LOCAL_CFLAGS += -DMP3_MAD_MUSIC
LOCAL_SHARED_LIBRARIES += mad
endif

2
alienblaster/project/jni/tremor/Android.mk
View File

@@ -10,5 +10,5 @@ LOCAL_CPP_EXTENSION := .cpp
LOCAL_SRC_FILES := $(notdir $(wildcard $(LOCAL_PATH)/*.c))
include $(BUILD_SHARED_LIBRARY)
include $(BUILD_STATIC_LIBRARY)

14
alienblaster/project/src/Globals.java
View File

@@ -1,22 +1,19 @@
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount anywhere
package de.schwardtnet.alienblaster;
import android.app.Activity;
import android.content.Context;
class Globals {
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
public static String ApplicationName = "AlienBlaster";
// Should be zip file
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
public static String DataDownloadUrl = "http://sites.google.com/site/xpelyax/Home/alienblaster110_data.zip?attredirects=0%26d=1"; // This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
// Set DownloadToSdcard to true if your app data is bigger than 5 megabytes.
// It will download app data to /sdcard/alienblaster then,
// otherwise it will download it to /data/data/de.schwardtnet.alienblaster/files -
// set this dir in jni/Android.mk in SDL_CURDIR_PATH
// This string is autogenerated by ChangeAppSettings.sh, do not change spaces amount
public static boolean DownloadToSdcard = false;
// Set this value to true if you're planning to render 3D using OpenGL - it eats some GFX resources, so disabled for 2D
@@ -27,12 +24,5 @@ class Globals {
}
class LoadLibrary {
public LoadLibrary()
{
System.loadLibrary("tremor");
System.loadLibrary("sdl");
System.loadLibrary("sdl_mixer");
System.loadLibrary("sdl_image");
System.loadLibrary("sdl_ttf");
}
public LoadLibrary() { System.loadLibrary("sdl"); System.loadLibrary("mad"); System.loadLibrary("sdl_mixer"); System.loadLibrary("sdl_image"); System.loadLibrary("sdl_ttf"); };
}