From d7cf7905d813e8d4551b14c17c771b5566a4416a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alexis=20Laferri=C3=A8re?= Date: Mon, 24 Aug 2015 13:58:41 -0400 Subject: [PATCH] contrib/crazy_moles: update Makefile to use the new check-android.sh MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Alexis Laferrière --- contrib/crazy_moles/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contrib/crazy_moles/Makefile b/contrib/crazy_moles/Makefile index 06751d0..3fc90f7 100644 --- a/contrib/crazy_moles/Makefile +++ b/contrib/crazy_moles/Makefile @@ -4,10 +4,12 @@ bin/moles: $(shell ../../bin/nitls -M src/moles_linux.nit) assets/images/drawing mkdir -p bin ../../bin/nitc -o bin/moles src/moles_linux.nit -android: android-icons $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png +bin/moles.apk: android-icons $(shell ../../bin/nitls -M src/moles_android.nit) assets/images/drawing.png mkdir -p bin ../../bin/nitc -o bin/moles.apk src/moles_android.nit +android: bin/moles.apk + ../inkscape_tools/bin/svg_to_icons: $(MAKE) -C ../inkscape_tools @@ -15,15 +17,15 @@ android-icons: ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg mkdir -p res ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/ -android-install: android +android-install: bin/moles.apk adb install -rf bin/moles.apk assets/images/drawing.png: art/drawing.svg ../../contrib/inkscape_tools/bin/svg_to_icons mkdir -p assets/images ../inkscape_tools/bin/svg_to_png_and_nit --src src/ --scale 2.0 art/drawing.svg -check-android: - ./check-android.sh +check-android: bin/moles.apk + ../../misc/jenkins/check_android.sh bin/moles.apk clean: rm -rf bin res -- 1.7.9.5