diff --git a/metadata/com.nooskewl.bobby.txt b/metadata/com.nooskewl.bobby.txt deleted file mode 100644 index 7dbbf263b4..0000000000 --- a/metadata/com.nooskewl.bobby.txt +++ /dev/null @@ -1,44 +0,0 @@ -Categories:Games -License:Zlib -Web Site:http://www.nooskewl.com/content/bobby -Source Code:http://www.nooskewl.com/content/more-open-source -Issue Tracker:http://www.nooskewl.com/forums/bobby - -Auto Name:Bobby -Summary:2-D game -Description: -Arcarde-bouncer that lets you play as a rocket-bullet in outer space on it's -mission to defeat the green balls! -. - -Repo Type:git -Repo:git://nooskewl.com/bobby.git - -Build:1.4.1,2 - disable=WIP c544e260f - commit=unknown - see disabled - subdir=android-proj - patch=bobby.patch - prebuild=sed -i 's/true/false/g' AndroidManifest.xml && \ - wget https://download.savannah.gnu.org/releases/freetype/freetype-2.4.10.tar.bz2 && \ - tar xvjf freetype-2.4.10.tar.bz2 && \ - rm freetype-2.4.10.tar.bz2 && \ - git clone https://git.code.sf.net/p/alleg/allegro && \ - mkdir -p allegro/build jni/armeabi - scanignore=toolchain,jni - build=$$NDK$$/build/tools/make-standalone-toolchain.sh --platform=android-9 --install-dir=toolchain && \ - cd freetype-2.4.10/ && \ - ./configure --prefix=../toolchain --host=arm-linux-androideabi --enable-static=yes --enable-shared=no CC=arm-linux-androideabi-gcc CPP=arm-linux-androideabi-cpp AR=arm-linux-androideabi-ar && \ - make && \ - cd ../allegro/ && \ - git checkout 5.1 && \ - cd build/ && \ - cmake .. -DANDROID_NDK_TOOLCHAIN_ROOT=../../toolchain -DWANT_ANDROID=on -DWANT_EXAMPLES=OFF -DWANT_DEMO=OFF -DCMAKE_BUILD_TYPE=Debug -DFREETYPE_LIBRARY=../../freetype-2.4.10/builds/libfreetype.a -DFREETYPE_INCLUDE_DIR_freetype=../../freetype-2.4.10/include/freetype -DFREETYPE_INCLUDE_DIR_ft2build=../../freetype-2.4.10/include && \ - make && \ - make install && \ - cd ../../ && \ - mv allegro/build/lib/*.so jni/armeabi/ && \ - ANDROID_NDK_TOOLCHAIN_ROOT=toolchain $$NDK$$/ndk-build - -Auto Update Mode:None -Update Check Mode:Static diff --git a/metadata/com.nooskewl.bobby/bobby.patch b/metadata/com.nooskewl.bobby/bobby.patch deleted file mode 100644 index 64c1c3375c..0000000000 --- a/metadata/com.nooskewl.bobby/bobby.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff --git a/android-proj/jni/Android.mk b/android-proj/jni/Android.mk -index 0f83e81..c540c07 100644 ---- a/android-proj/jni/Android.mk -+++ b/android-proj/jni/Android.mk -@@ -39,25 +39,32 @@ include $(PREBUILT_SHARED_LIBRARY) - - include $(CLEAR_VARS) - --LOCAL_MODULE := liballegro_ttf-prebuilt --LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_ttf-debug.so -+LOCAL_MODULE := liballegro_acodec -+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_acodec-debug.so - include $(PREBUILT_SHARED_LIBRARY) - - include $(CLEAR_VARS) - --LOCAL_MODULE := libbass-prebuilt --LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/libbass.so -+LOCAL_MODULE := liballegro_audio -+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_audio-debug.so - include $(PREBUILT_SHARED_LIBRARY) - - include $(CLEAR_VARS) - -+LOCAL_MODULE := liballegro_ttf-prebuilt -+LOCAL_SRC_FILES := $(TARGET_ARCH_ABI)/liballegro_ttf-debug.so -+include $(PREBUILT_SHARED_LIBRARY) -+ -+include $(CLEAR_VARS) -+ -+ - LOCAL_ALLOW_UNDEFINED_SYMBOLS := false - LOCAL_MODULE := Bobby - LOCAL_SRC_FILES := Bobby.c bassstuff.cpp - LOCAL_LDLIBS := --LOCAL_CFLAGS := -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/include -DDEBUGMODE -DWITHOUT_GAMECENTER -+LOCAL_CFLAGS := -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi-v7a/include -DDEBUGMODE -DWITHOUT_GAMECENTER -DKCM_AUDIO -I$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/include -DDEBUGMODE -DWITHOUT_GAMECENTER -DKCM_AUDIO - --LOCAL_LDLIBS := -L$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/lib -L$(LOCAL_PATH)/$(TARGET_ARCH_ABI) -llog libs/$(TARGET_ARCH_ABI)/liballegro-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_primitives-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_image-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_font-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_ttf-debug.so libs/$(TARGET_ARCH_ABI)/libbass.so -lGLESv1_CM -+LOCAL_LDLIBS := -L$(ANDROID_NDK_TOOLCHAIN_ROOT)/user/armeabi/lib -L$(LOCAL_PATH)/$(TARGET_ARCH_ABI) -llog libs/$(TARGET_ARCH_ABI)/liballegro-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_primitives-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_image-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_font-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_ttf-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_audio-debug.so libs/$(TARGET_ARCH_ABI)/liballegro_acodec-debug.so -lGLESv1_CM - - include $(BUILD_SHARED_LIBRARY) - -diff --git a/android-proj/jni/Application.mk b/android-proj/jni/Application.mk -index 3a14cf5..4a51fd3 100644 ---- a/android-proj/jni/Application.mk -+++ b/android-proj/jni/Application.mk -@@ -1,4 +1,4 @@ - APP_PLATFORM := android-10 --APP_ABI := armeabi --APP_MODULES := liballegro-prebuilt liballegro_primitives-prebuilt liballegro_image-prebuilt liballegro_font-prebuilt liballegro_ttf-prebuilt libbass-prebuilt Bobby -+APP_ABI := armeabi armeabi-v7a -+APP_MODULES := liballegro-prebuilt liballegro_primitives-prebuilt liballegro_image-prebuilt liballegro_font-prebuilt liballegro_ttf-prebuilt liballegro_acodec liballegro_audio Bobby - APP_STL := stlport_static -diff --git a/android-proj/src/com/nooskewl/bobby/AllegroActivity.java b/android-proj/src/com/nooskewl/bobby/AllegroActivity.java -index 3e18663..063c0c1 100644 ---- a/android-proj/src/com/nooskewl/bobby/AllegroActivity.java -+++ b/android-proj/src/com/nooskewl/bobby/AllegroActivity.java -@@ -117,7 +117,8 @@ public class AllegroActivity extends Activity implements SensorEventListener - System.loadLibrary("allegro_image-debug"); - System.loadLibrary("allegro_font-debug"); - System.loadLibrary("allegro_ttf-debug"); -- System.loadLibrary("bass"); -+ System.loadLibrary("allegro_audio-debug"); -+ System.loadLibrary("allegro_acodec-debug"); - System.loadLibrary("Bobby"); - } -