From d85559b20e707e043ad0190ad87d02a9de60b165 Mon Sep 17 00:00:00 2001 From: Przemyslaw Rzepecki Date: Fri, 17 Jul 2015 14:23:44 +0200 Subject: [PATCH] Traffar*: Fixed broken builds --- metadata/com.traffar.game_of_life.txt | 8 +++++++- metadata/com.traffar.gomoku.txt | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/metadata/com.traffar.game_of_life.txt b/metadata/com.traffar.game_of_life.txt index e70212bbf0..ccc948db1b 100644 --- a/metadata/com.traffar.game_of_life.txt +++ b/metadata/com.traffar.game_of_life.txt @@ -39,6 +39,7 @@ Build:0.2,2 buildjni=yes Build:0.3,3 + disable=pull apk commit=0.3 subdir=android srclibs=SDL@release-2.0.3,SDL_mixer@release-2.0.0,SDL_image@release-2.0.0 @@ -59,7 +60,12 @@ Build:0.4,4 ln -s ../../$$SDL$$/include jni/SDL/ && \ ln -s ../$$SDL_mixer$$ jni/SDL_mixer && \ ln -s ../$$SDL_image$$ jni/SDL_image && \ - echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/" jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/" jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/" jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/" jni/SDL_mixer/Android.mk + echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&\ + sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/" jni/SDL_image/Android.mk && \ + sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/" jni/SDL_image/Android.mk && \ + sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk && \ + sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/" jni/SDL_mixer/Android.mk && \ + sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/" jni/SDL_mixer/Android.mk buildjni=yes Auto Update Mode:Version %v diff --git a/metadata/com.traffar.gomoku.txt b/metadata/com.traffar.gomoku.txt index 7bde45e9c0..f61f8c518b 100644 --- a/metadata/com.traffar.gomoku.txt +++ b/metadata/com.traffar.gomoku.txt @@ -29,6 +29,7 @@ Build:0.1,1 buildjni=yes Build:0.2,2 + disable=remove apk commit=0.2 subdir=android srclibs=SDL@release-2.0.3,SDL_mixer@release-2.0.0,SDL_image@release-2.0.0 @@ -40,6 +41,23 @@ Build:0.2,2 echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/" jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/" jni/SDL_image/Android.mk &&sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/" jni/SDL_mixer/Android.mk &&sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/" jni/SDL_mixer/Android.mk buildjni=yes +Build:0.3,3 + commit=0.3 + subdir=android + srclibs=SDL@release-2.0.3,SDL_mixer@release-2.0.0,SDL_image@release-2.0.0 + prebuild=rm -rf jni/SDL/src jni/SDL/include jni/SDL_mixer jni/SDL_image && \ + ln -s ../../$$SDL$$/src jni/SDL/ && \ + ln -s ../../$$SDL$$/include jni/SDL/ && \ + ln -s ../$$SDL_mixer$$ jni/SDL_mixer && \ + ln -s ../$$SDL_image$$ jni/SDL_image && \ + echo "" > jni/SDL/src/dynapi/SDL_dynapi.h &&\ + sed -i "s/SUPPORT_WEBP := true/SUPPORT_WEBP := false/" jni/SDL_image/Android.mk && \ + sed -i "s/SUPPORT_JPG := true/SUPPORT_JPG := false/" jni/SDL_image/Android.mk && \ + sed -i "s/SUPPORT_MOD_MODPLUG := true/SUPPORT_MOD_MODPLUG := false/" jni/SDL_mixer/Android.mk && \ + sed -i "s/SUPPORT_MOD_MIKMOD := true/SUPPORT_MOD_MIKMOD := false/" jni/SDL_mixer/Android.mk && \ + sed -i "s/SUPPORT_MP3_SMPEG := true/SUPPORT_MP3_SMPEG := false/" jni/SDL_mixer/Android.mk + buildjni=yes + Auto Update Mode:None Update Check Mode:Tags Current Version:0.3