contrib: move lib/gamnit/examples/asteronits to contrib/
authorAlexis Laferrière <alexis.laf@xymus.net>
Mon, 14 Dec 2015 17:46:18 +0000 (12:46 -0500)
committerAlexis Laferrière <alexis.laf@xymus.net>
Mon, 14 Dec 2015 18:47:11 +0000 (13:47 -0500)
Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

17 files changed:
contrib/asteronits/Makefile [moved from lib/gamnit/examples/asteronits/Makefile with 78% similarity]
contrib/asteronits/README.md [moved from lib/gamnit/examples/asteronits/README.md with 100% similarity]
contrib/asteronits/art/controls.svg [moved from lib/gamnit/examples/asteronits/art/controls.svg with 100% similarity]
contrib/asteronits/art/icon.svg [moved from lib/gamnit/examples/asteronits/art/icon.svg with 100% similarity]
contrib/asteronits/art/sheet.xml [moved from lib/gamnit/examples/asteronits/art/sheet.xml with 100% similarity]
contrib/asteronits/assets/.gitignore [moved from lib/gamnit/examples/asteronits/assets/.gitignore with 100% similarity]
contrib/asteronits/assets/images/sheet.png [moved from lib/gamnit/examples/asteronits/assets/images/sheet.png with 100% similarity]
contrib/asteronits/bin/.gitignore [moved from lib/gamnit/examples/asteronits/bin/.gitignore with 100% similarity]
contrib/asteronits/org.nitlanguage.asteronits.txt [moved from lib/gamnit/examples/asteronits/org.nitlanguage.asteronits.txt with 100% similarity]
contrib/asteronits/package.ini [moved from lib/gamnit/examples/asteronits/package.ini with 100% similarity]
contrib/asteronits/res/.gitignore [moved from lib/gamnit/examples/asteronits/res/.gitignore with 100% similarity]
contrib/asteronits/src/.gitignore [moved from lib/gamnit/examples/asteronits/src/.gitignore with 100% similarity]
contrib/asteronits/src/asteronits.nit [moved from lib/gamnit/examples/asteronits/src/asteronits.nit with 100% similarity]
contrib/asteronits/src/game_logic.nit [moved from lib/gamnit/examples/asteronits/src/game_logic.nit with 100% similarity]
contrib/asteronits/src/texture_atlas_parser.nit [moved from lib/gamnit/examples/asteronits/src/texture_atlas_parser.nit with 100% similarity]
contrib/asteronits/src/touch_ui.nit [moved from lib/gamnit/examples/asteronits/src/touch_ui.nit with 100% similarity]
lib/gamnit/simple_2d.nit

similarity index 78%
rename from lib/gamnit/examples/asteronits/Makefile
rename to contrib/asteronits/Makefile
index dae31dd..c4cedc4 100644 (file)
@@ -1,5 +1,5 @@
-NITC=../../../../bin/nitc
-NITLS=../../../../bin/nitls
+NITC=../../bin/nitc
+NITLS=../../bin/nitls
 
 all: bin/asteronits
 
@@ -10,7 +10,8 @@ bin/texture_atlas_parser: src/texture_atlas_parser.nit
        ${NITC} src/texture_atlas_parser.nit -o $@
 
 src/controls.nit: art/controls.svg
-       ../../../../contrib/inkscape_tools/bin/svg_to_png_and_nit art/controls.svg -a assets/ -s src/ -x 2.0 -g
+       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
        bin/texture_atlas_parser art/sheet.xml --dir src/ -n spritesheet
@@ -31,4 +32,4 @@ android-release: $(shell ${NITLS} -M src/asteronits.nit android) ${NITC} res/dra
        ${NITC} src/touch_ui.nit -m android -o bin/asteronits.apk --release
 
 res/drawable-hdpi/icon.png: art/icon.svg
-       ../../../../contrib/inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg
+       ../inkscape_tools/bin/svg_to_icons --out res --android art/icon.svg
index a37279b..338f736 100644 (file)
@@ -29,7 +29,7 @@
 #   It can be used to standardize the size of the UI across devices.
 #   It is used to position the sprites in `App::ui_sprites`.
 #
-# See the sample game at `examples/asteronits/`.
+# See the sample game at `contrib/asteronits/`.
 module simple_2d
 
 import glesv2