a_star: don't crash on deserialization errors and limit static types

[nit.git] / contrib / asteronits / Makefile

diff --git a/contrib/asteronits/Makefile b/contrib/asteronits/Makefile
index 08b689c..aee8027 100644 (file)
--- a/contrib/asteronits/Makefile
+++ b/contrib/asteronits/Makefile
@@ -1,22 +1,18 @@
-NITC=../../bin/nitc
-NITLS=../../bin/nitls
+NITC=nitc
+NITLS=nitls
 
 all: bin/asteronits
 
-bin/asteronits: $(shell ${NITLS} -M src/asteronits.nit linux) ${NITC} pre-build
+bin/asteronits: $(shell ${NITLS} -M src/asteronits.nit linux) pre-build
        ${NITC} src/asteronits.nit -m linux -o $@
 
-bin/texture_atlas_parser: src/texture_atlas_parser.nit
-       ${NITC} src/texture_atlas_parser.nit -o $@
+bin/texture_atlas_parser: ../../lib/gamnit/texture_atlas_parser.nit
+       ${NITC} ../../lib/gamnit/texture_atlas_parser.nit -o $@
 
-src/controls.nit: art/controls.svg
-       make -C ../inkscape_tools/
-       ../inkscape_tools/bin/svg_to_png_and_nit art/controls.svg -a assets/ -s src/ -x 2.0 -g
-
-src/spritesheet_city.nit: bin/texture_atlas_parser
+src/spritesheet.nit: bin/texture_atlas_parser
        bin/texture_atlas_parser art/sheet.xml --dir src/ -n spritesheet
 
-pre-build: src/controls.nit src/spritesheet_city.nit
+pre-build: src/spritesheet.nit
 
 check: bin/asteronits
        NIT_TESTING=true bin/asteronits
@@ -25,12 +21,12 @@ check: bin/asteronits
 # Android
 
 android: bin/asteronits.apk
-bin/asteronits.apk: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/drawable-hdpi/icon.png pre-build
+bin/asteronits.apk: $(shell ${NITLS} -M src/asteronits.nit android) android/res/ pre-build
        ${NITC} src/android.nit -m android -o $@
 
-android-release: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/drawable-hdpi/icon.png pre-build
+android-release: $(shell ${NITLS} -M src/asteronits.nit android) android/res/ pre-build
        ${NITC} src/android.nit -m android -o bin/asteronits.apk --release
 
-res/drawable-hdpi/icon.png: art/icon.svg
+android/res/: art/icon.svg
        make -C ../inkscape_tools/
-       ../inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg
+       ../inkscape_tools/bin/svg_to_icons --out android/res --android art/icon.svg