X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=dc8eff0d8fa6d835f8240c9d0670c4fd836747b7;hb=c6a8817a4777c002e9966519294a61da209052d1;hp=0e800dcca1c57b1ccab160ab387ade52e8e9fb28;hpb=6273d89ab9dea6b849bbebe97526870d41a8879e;p=~andy%2Fspades

diff --git a/makefile b/makefile
index 0e800dc..dc8eff0 100644
--- a/makefile
+++ b/makefile
@@ -24,17 +24,41 @@ clean:
 	rm -rf bin gen obj
 
 logcat:
-	adb logcat Spades:D '*:S'
+	adb logcat Spades:D AndroidRuntime:E '*:S'
 
 run: bin/install.stamp
 	adb shell am start -W -a android.intent.action.MAIN -n $(PACKAGE)/.Main
-	
 
 install bin/install.stamp: $(OUTPUT)
-	adb uninstall $(PACKAGE)
 	adb install -r $+
 	touch bin/install.stamp
 
+uninstall:
+	adb uninstall $(PACKAGE)
+	rm bin/install.stamp
+
+graphics:
+	git checkout graphics  --    \
+	        'opt/drawable/*.svg' \
+	        'opt/drawable/*.xcf' \
+	        'res/drawable/*.png' \
+	        'res/drawable/*.jpg'
+	git reset HEAD --            \
+	        'opt/drawable/*.svg' \
+	        'opt/drawable/*.xcf' \
+	        'res/drawable/*.png' \
+	        'res/drawable/*.jpg'
+
+convert:
+	for svg in opt/drawable/*.svg; do        \
+	        png=$${svg/svg/png};             \
+	        png=$${png/opt/res};             \
+	        rsvg-convert -w 2048 -h 2048     \
+	                $$svg -o $$png;          \
+	        convert -trim -resize '256x256!' \
+	                $$png $$png;             \
+	done
+
 # Rules
 %.apk: %.dex %.res | bin
 	@echo "APK    $@.in"
@@ -56,7 +80,7 @@ install bin/install.stamp: $(OUTPUT)
 
 $(OBJ): $(SRC) $(GEN) | obj
 	@echo "JAVAC  $@"
-	@javac -g                         \
+	@javac -g -Xlint:unchecked        \
 		-bootclasspath $(ANDROID) \
 		-encoding      UTF-8      \
 		-source        1.5        \