From 0091365cada2f631668f8bbc416c01095551bc19 Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 21 Apr 2013 03:45:47 +0000 Subject: [PATCH] Update graphics branch --- .gitignore | 6 ++++-- makefile | 18 +++++++++++------- 2 files changed, 15 insertions(+), 9 deletions(-) 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 \ -- 2.43.2