From 1ecf7fc0cadeec9dcb81c3c45cd54addd246dc8e Mon Sep 17 00:00:00 2001 From: AlexanderR Date: Fri, 8 Nov 2013 04:06:55 +1100 Subject: [PATCH] Another attempt at OpenMSX/AGS fixing --- metadata/com.bigbluecup.android.launcher.txt | 5 ++--- metadata/org.openmsx.android.openmsx.txt | 10 +++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/metadata/com.bigbluecup.android.launcher.txt b/metadata/com.bigbluecup.android.launcher.txt index 4ecf47d8ec..30439011ba 100644 --- a/metadata/com.bigbluecup.android.launcher.txt +++ b/metadata/com.bigbluecup.android.launcher.txt @@ -27,13 +27,12 @@ Status: BETA . Repo Type:git -#Repo:git://github.com/adventuregamestudio/ags.git -Repo:file:///home/uniqa/ags +Repo:git://github.com/adventuregamestudio/ags.git # ignored files Build:3.3.0-beta,1 commit=v.3.3.0-beta - init=find ../.. -iregex ".+\.\(a\|dll\|so\|exe\|lib\)" -type f -delete && \ + init=cd ../.. && -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 diff --git a/metadata/org.openmsx.android.openmsx.txt b/metadata/org.openmsx.android.openmsx.txt index 2797237dd7..9c09700033 100644 --- a/metadata/org.openmsx.android.openmsx.txt +++ b/metadata/org.openmsx.android.openmsx.txt @@ -34,14 +34,14 @@ Repo:libsdl-android Build Version:0.9.1-584,11527,openttd-1.2.3.25,update=no,srclibs=OpenMSX@728325a472,buildjni=no,\ subdir=project,patch=tcl.patch,scanignore=project/jni/tcl8.5,\ init=\ - ln -s ../../OpenMSX openmsx && \ + ln -s ../../OpenMSX/ openmsx && \ sed -ri 's/ant debug|ant release/exit/' ../build.sh && \ 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,\ + rm -rf android/ ffmpeg/ avcodec/ python/ boost* ../themes/converter/converter,\ build=\ - sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \ + export SDL_ANDROID_PORT_PATH=`readlink -f ..` && cd openmsx/build/android && \ + sed 's/android-15/android-17/' -i setup_anddev.sh && ./setup_anddev.sh && \ + cd ../../../ && sed -ri 's/(debuggable)="true"/\1="false"/' AndroidManifest.xml && \ cd openmsx/build/android/openmsx && \ declare -rx VERSION_NAME=0.9.1-584 && \ ./launch_anddev_build.sh