From: Andy Spencer <andy753421@gmail.com>
Date: Sun, 21 Apr 2013 03:45:47 +0000 (+0000)
Subject: Update graphics branch
X-Git-Url: http://pileus.org/git/?p=~andy%2Fspades;a=commitdiff_plain;h=0091365cada2f631668f8bbc416c01095551bc19

Update graphics branch
---

diff --git a/.gitignore b/.gitignore
index a9c24c6..b8ef052 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,7 @@ gen/
 obj/
 
 # Leave out cards for now
-res/drawable/card_*.png
-opt/drawable/card_*.svg
+opt/drawable/*.svg
+opt/drawable/*.xcf
+res/drawable/*.png
+res/drawable/*.jpg
diff --git a/makefile b/makefile
index e0a1d30..6964ec3 100644
--- a/makefile
+++ b/makefile
@@ -37,13 +37,17 @@ uninstall:
 	adb uninstall $(PACKAGE)
 	rm bin/install.stamp
 
-png-cards:
-	git checkout cards-png -- 'res/drawable/card_*.png'
-	git reset    HEAD      -- 'res/drawable/card_*.png'
-
-svg-cards:
-	git checkout cards-svg -- 'opt/drawable/card_*.svg'
-	git reset    HEAD      -- 'opt/drawable/card_*.svg'
+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        \