contrib & examples: update Android apps

[nit.git] / contrib / tinks / Makefile

diff --git a/contrib/tinks/Makefile b/contrib/tinks/Makefile
index 5bee72e..f74ff97 100644 (file)
--- a/contrib/tinks/Makefile
+++ b/contrib/tinks/Makefile
@@ -12,14 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: bin/server bin/tinks
+all: bin/server bin/tinks bin/tinks3d
+
+pre-build: assets/images/drawing.png src/server/server_serialize.nit
 
 # Client
-bin/tinks: assets/images/drawing.png src/client/client_serialize.nit $(shell ../../bin/nitls -M src/client/linux_client.nit)
+bin/tinks: assets/images/drawing.png src/client/client.nit $(shell ../../bin/nitls -M src/client/linux_client.nit)
+       ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
        ../../bin/nitc -o bin/tinks src/client/linux_client.nit -m src/client/client_serialize.nit
 
-src/client/client_serialize.nit: $(shell ../../bin/nitls -M src/client/client.nit)
-       ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
+bin/tinks3d: $(shell ../../bin/nitls -M src/client/client3d.nit -m linux)
+       ../../bin/nitserial -o src/client/client_serialize.nit src/client/client3d.nit
+       ../../bin/nitc -o bin/tinks3d src/client/client3d.nit \
+               -m src/client/client_serialize.nit -m linux
 
 assets/images/drawing.png: art/drawing.svg
        ../inkscape_tools/bin/svg_to_png_and_nit art/drawing.svg -a assets/ -s src/client/ -x 2.0
@@ -31,10 +36,17 @@ bin/server: src/server/server_serialize.nit $(shell ../../bin/nitls -M src/serve
 src/server/server_serialize.nit: $(shell ../../bin/nitls -M src/server/dedicated.nit)
        ../../bin/nitserial -o src/server/server_serialize.nit src/server/dedicated.nit
 
-# Archive
-pub: assets/images/drawing.png src/client/client_serialize.nit
-       ../../bin/nitc --no-stacktrace -o bin/tinks src/client/linux_client.nit -m src/client/client_serialize.nit
-       tar -czvf bin/tinks.tar.gz bin/tinks assets/
-       scp bin/tinks.tar.gz xymus.net:/var/www/pub/
+# Android
+android: bin/tinks.apk
+bin/tinks.apk: assets/images/drawing.png android/res/ $(shell ../../bin/nitls -M src/client/android_client.nit)
+       ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
+       ../../bin/nitc -o bin/tinks.apk src/client/android_client.nit -m src/client/client_serialize.nit
+
+android-release: assets/images/drawing.png android/res/ $(shell ../../bin/nitls -M src/client/android_client.nit)
+       ../../bin/nitserial -o src/client/client_serialize.nit src/client/client.nit
+       ../../bin/nitc -o bin/tinks.apk src/client/android_client.nit -m src/client/client_serialize.nit --release
+
+android/res/: art/icon.svg
+       ../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
 .PHONY: pub