X-Git-Url: http://nitlanguage.org

diff --git a/contrib/tinks/Makefile b/contrib/tinks/Makefile
index ee13360..ab9f82f 100644
--- a/contrib/tinks/Makefile
+++ b/contrib/tinks/Makefile
@@ -12,40 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-all: bin/server bin/tinks
+all: bin/server bin/tinks3d
 
-# Client
-bin/tinks: assets/images/drawing.png src/client/client_serialize.nit $(shell ../../bin/nitls -M src/client/linux_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
+pre-build: src/server/server_serialize.nit
 
-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
+# Client
+bin/tinks3d: $(shell nitls -M src/client/client3d.nit -m linux)
+	nitserial -o src/client/client_serialize.nit src/client/client3d.nit
+	nitc -o bin/tinks3d src/client/client3d.nit \
+		-m src/client/client_serialize.nit -m linux
 
 # Server
-bin/server: src/server/server_serialize.nit $(shell ../../bin/nitls -M src/server/dedicated.nit)
-	../../bin/nitc -o bin/server src/server/dedicated.nit -m src/server/server_serialize.nit
+bin/server: src/server/server_serialize.nit $(shell nitls -M src/server/dedicated.nit)
+	nitc -o bin/server src/server/dedicated.nit -m src/server/server_serialize.nit
 
-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
+src/server/server_serialize.nit: $(shell nitls -M src/server/dedicated.nit)
+	nitserial -o src/server/server_serialize.nit src/server/dedicated.nit
 
 # Android
-android: bin/tinks.apk
-bin/tinks.apk: assets/images/drawing.png src/client/client_serialize.nit res/drawable-ldpi/icon.png $(shell ../../bin/nitls -M src/client/android_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 src/client/client_serialize.nit res/drawable-ldpi/icon.png $(shell ../../bin/nitls -M src/client/android_client.nit)
-	../../bin/nitc -o bin/tinks.apk src/client/android_client.nit -m src/client/client_serialize.nit --release
-
-res/drawable-ldpi/icon.png: art/icon.svg
-	../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out res/
-
-# Archive
-pub: assets/images/drawing.png src/client/client_serialize.nit bin/tinks.apk
-	../../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 bin/tinks.apk xymus.net:/var/www/pub/
-
-.PHONY: pub
+android/res/: art/icon.svg
+	../inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/