From 477a4340a36be3fdc8b50991ee6029030501e24b Mon Sep 17 00:00:00 2001 From: AlexanderR Date: Sat, 2 Nov 2013 08:21:51 +1100 Subject: [PATCH 1/3] Fixed Yabause build --- metadata/org.yabause.android.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata/org.yabause.android.txt b/metadata/org.yabause.android.txt index f53d3ce173..d7b91f51a0 100644 --- a/metadata/org.yabause.android.txt +++ b/metadata/org.yabause.android.txt @@ -10,7 +10,7 @@ Description: Yabause support booting games using Saturn cds or iso files. BIOS (optional) should be placed into /sdcard/yabause/bios and games go in /sdcard/yabause/games. -[Compatibility list http://yabause.org/compatibility-list/] +[http://yabause.org/compatibility-list/ Compatibility list] Status: ALPHA . @@ -21,12 +21,12 @@ Repo:http://svn.code.sf.net/p/yabause/code/trunk/ # r3136 is the last, known to work for sure Build Version:0.9.11,1,3136,buildjni=no,subdir=yabause/src/android,patch=toolchain.patch,\ build=\ - cd ../.. && \ + echo "APP_CFLAGS+=-Wno-error=format-security" > jni/Application.mk && \ + export ANDROID_NDK="$$NDK$$" && cd ../.. && \ export PATH="$PATH:$$NDK$$/toolchains/arm-linux-androideabi-4.6/prebuilt/linux-x86/bin" && \ - export ANDROID_NDK="$$NDK$$" && \ cmake -DCMAKE_TOOLCHAIN_FILE=src/android/android.cmake \ -DNDK_BUILD=$$NDK$$/ndk-build -DSDK_ANDROID=$$SDK$$/tools/android \ - -DYAB_PORTS=android . && make + -DYAB_PORTS=android . && make Auto Update Mode:None Update Check Mode:None From 489341eb3178d2b823ae52ca6f89e3ccdc7d13fc Mon Sep 17 00:00:00 2001 From: AlexanderR Date: Sat, 2 Nov 2013 08:29:17 +1100 Subject: [PATCH 2/3] Fix OpenMSX (once again!) --- metadata/org.openmsx.android.openmsx.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt index 63075fa2ee..2797237dd7 100644 --- a/metadata/org.openmsx.android.openmsx.txt +++ b/metadata/org.openmsx.android.openmsx.txt @@ -36,7 +36,7 @@ subdir=project,patch=tcl.patch,scanignore=project/jni/tcl8.5,\ init=\ ln -s ../../OpenMSX openmsx && \ sed -ri 's/ant debug|ant release/exit/' ../build.sh && \ - find -L -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \ + find -regex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && cd jni && \ rm -rf ffmpeg/lib/* python/src/pythonp python/src/Parser/pgen ../themes/converter/converter && \ prebuild=\ export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && ./setup_anddev.sh,\ From f72d69aebfc9c1a26a57545ae18aad0588514c56 Mon Sep 17 00:00:00 2001 From: AlexanderR Date: Sat, 2 Nov 2013 11:24:59 +1100 Subject: [PATCH 3/3] Fix AGS --- metadata/com.bigbluecup.android.launcher.txt | 11 ++- .../ndkr9.patch | 72 +++++++++++++++++++ 2 files changed, 80 insertions(+), 3 deletions(-) create mode 100644 metadata/com.bigbluecup.android.launcher/ndkr9.patch diff --git a/metadata/com.bigbluecup.android.launcher.txt b/metadata/com.bigbluecup.android.launcher.txt index 87adc23680..4ecf47d8ec 100644 --- a/metadata/com.bigbluecup.android.launcher.txt +++ b/metadata/com.bigbluecup.android.launcher.txt @@ -27,14 +27,19 @@ Status: BETA . Repo Type:git -Repo:git://github.com/adventuregamestudio/ags.git +#Repo:git://github.com/adventuregamestudio/ags.git +Repo:file:///home/uniqa/ags +# ignored files Build:3.3.0-beta,1 commit=v.3.3.0-beta - disabled=Tons of prebuilts + init=find ../.. -iregex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \ + git submodule foreach git checkout d6f13daef9 + build=cd ../buildlibs && find -name "*.sh" -exec chmod +x {} + && ./buildall.sh + patch=ndkr9.patch subdir=Android/launcher_list submodules=yes - target=android-16 + target=android-17 update=.;../library forceversion=yes buildjni=../library diff --git a/metadata/com.bigbluecup.android.launcher/ndkr9.patch b/metadata/com.bigbluecup.android.launcher/ndkr9.patch new file mode 100644 index 0000000000..76237603db --- /dev/null +++ b/metadata/com.bigbluecup.android.launcher/ndkr9.patch @@ -0,0 +1,72 @@ +From fe3d87c86b830c5e6d7b7e990de5ec5ef68483e7 Mon Sep 17 00:00:00 2001 +From: jjsat +Date: Sun, 25 Aug 2013 11:39:02 +0200 +Subject: [PATCH] Android: Fix building with NDK r9. + +--- + Android/library/jni/pe_jni.c | 2 +- + Engine/platform/android/acpland.cpp | 6 +++--- + Engine/platform/util/libc.c | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Android/library/jni/pe_jni.c b/Android/library/jni/pe_jni.c +index ac5b359..c24681b 100644 +--- a/Android/library/jni/pe_jni.c ++++ b/Android/library/jni/pe_jni.c +@@ -13,7 +13,7 @@ void android_debug_printf(char* format, ...) + vsprintf(buffer, format, ap); + va_end(ap); + +- __android_log_print(ANDROID_LOG_DEBUG, "Allegro", buffer); ++ __android_log_print(ANDROID_LOG_DEBUG, "Allegro", "%s", buffer); + } + + int IsDataFile(version_info_t* version_info) +diff --git a/Engine/platform/android/acpland.cpp b/Engine/platform/android/acpland.cpp +index 3aa1668..244d595 100644 +--- a/Engine/platform/android/acpland.cpp ++++ b/Engine/platform/android/acpland.cpp +@@ -675,7 +675,7 @@ void AGSAndroid::WriteDebugString(const char* texx, ...) + va_start(ap,texx); + vsprintf(&displbuf[5],texx,ap); + va_end(ap); +- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf); ++ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf); + } + } + +@@ -712,7 +712,7 @@ void AGSAndroid::DisplayAlert(const char *text, ...) { + JNIEnv* thread_env; + android_jni_vm->AttachCurrentThread(&thread_env, NULL); + +- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf); ++ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf); + + jstring java_string = thread_env->NewStringUTF(displbuf); + thread_env->CallVoidMethod(java_object, java_messageCallback, java_string); +@@ -765,7 +765,7 @@ void AGSAndroid::WriteConsole(const char *text, ...) { + va_start(ap, text); + vsprintf(displbuf, text, ap); + va_end(ap); +- __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", displbuf); ++ __android_log_print(ANDROID_LOG_DEBUG, "AGSNative", "%s", displbuf); + } + + void AGSAndroid::ShutdownCDPlayer() { +diff --git a/Engine/platform/util/libc.c b/Engine/platform/util/libc.c +index e201d2b..e3820af 100644 +--- a/Engine/platform/util/libc.c ++++ b/Engine/platform/util/libc.c +@@ -19,7 +19,7 @@ + #include + + // Only a dummy. It is used in a function of alfont, but never called in AGS. +-size_t malloc_usable_size(void* allocation) ++size_t malloc_usable_size(const void* allocation) + { + return 0; + } +-- +1.8.4 + +