diff --git a/metadata/org.retroarch.txt b/metadata/org.retroarch.txt index 05571e3d01..86dc77eeb8 100644 --- a/metadata/org.retroarch.txt +++ b/metadata/org.retroarch.txt @@ -35,7 +35,6 @@ Repo:git://github.com/libretro/RetroArch.git Build Version:0.9.9.6,22,7d25e64fb446af37ccc50693e5662d8d48b655e5,subdir=android/phoenix,\ buildjni=no,srclibs=pcsx_rearmed@c6c27ccd79;bSNES@2b89497415,\ -init=sed 's/\$(SRCDIR)/..\/../' -i $$bSNES$$/target-libretro/jni/Android.mk,\ prebuild=cp -R ../../media/overlays/ assets/,\ build=\ $$NDK$$/ndk-build -C ../native && mv ../native/libs/ . && \ diff --git a/metadata/org.scummvm.scummvm.txt b/metadata/org.scummvm.scummvm.txt index 28c5883834..91e39ce33a 100644 --- a/metadata/org.scummvm.scummvm.txt +++ b/metadata/org.scummvm.scummvm.txt @@ -34,10 +34,8 @@ Repo:git://github.com/scummvm/scummvm.git Build Version:1.5.0,6,v1.5.0,\ extlibs=libmad/libmad-0.15.1b.tar.gz,srclibs=FLAC@1.2.1;Tremor@b31465b840,\ update=no,patch=fdroid_build.patch;latest_sdk.patch,bindir=.,antcommand="-p",\ -init=\ - echo -e '\n\n' > build.xml,\ build=\ - export ANDROID_SDK="$$SDK$$" && export ANDROID_NDK="$$NDK$$" && \ + export ANDROID_SDK="$$SDK$$" ANDROID_NDK="$$NDK$$" && \ chmod +x fdroid_build && \ ./fdroid_build tremor $$Tremor$$ && \ ./fdroid_build mad && \ diff --git a/metadata/org.scummvm.scummvm/fdroid_build.patch b/metadata/org.scummvm.scummvm/fdroid_build.patch index 1bc9e90356..2bf3025d39 100644 --- a/metadata/org.scummvm.scummvm/fdroid_build.patch +++ b/metadata/org.scummvm.scummvm/fdroid_build.patch @@ -35,7 +35,7 @@ index 0000000..f9a86f4 +export CXXFLAGS="${CFLAGS}" +export LDFLAGS="${MACHDEP}" + -+mkdir -p scummvm_libs && export PREF=`realpath ./scummvm_libs` ++mkdir -p scummvm_libs && export PREF=`readlink -f ./scummvm_libs` + +mad() { +tar xfz libs/libmad-0.15.1b.tar.gz