removed pnmoutline (no longer necessary).

[vor.git] / Makefile

diff --git a/Makefile b/Makefile
index 4c95ae4..98fff2e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,12 +17,20 @@
 
 debug := $(if $(DEBUG),1,0)
 ldflags := $(shell sdl-config --libs) -lSDL_image -lSDL_mixer
-cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug)
+cflags := $(shell sdl-config --cflags) -Wall -DDEBUG=$(debug) -ggdb
 
-my_objects := file.o score.o sound.o main.o $(if $(DEBUG),debug.o)
+my_objects := file.o score.o shape.o sound.o main.o $(if $(DEBUG),debug.o)
 libs := SFont.o
 objects := $(libs) $(my_objects)
 
+rocks := 00 01 02 03 04 05 06 07 08 09
+rocks += 10 11 12 13 14 15 16 17 18 19
+rocks += 20 21 22 23 24 25 26 27 28 29
+rocks += 30 31 32 33 34 35 36 37 38 39
+rocks += 40 41 42 43 44 45 46 47 48 49
+
+graphics := data/sprites/ship.png data/indicators/life.png $(rocks:%=data/sprites/rock%.png)
+
 INSTALL = install
 INSTALL_PROGRAM = $(INSTALL) -o games -g games
 INSTALL_DATA = $(INSTALL) -m 644
@@ -30,7 +38,8 @@ INSTALL_DATA = $(INSTALL) -m 644
 DATA_PREFIX = /usr/share/vor
 PROGRAM_PREFIX = /usr/games/bin
 
-all: vor data/sprites/ship.png
+
+all: vor $(graphics)
 
 %.o: %.c
        $(CC) $(cflags) -c -o $@ $<
@@ -42,18 +51,10 @@ main.o file.o: file.h
 vor: $(objects)
        $(CC) $(ldflags) -o $@ $^ $(LIBRARIES)
 
-pnmoutline: pnmoutline.c
-       $(CC) -lnetpbm -o $@ $<
-
-data/sprites/ship.png: ship.pov pnmoutline Makefile
-       povray -GA -D +A +UA +W32 +H32 $< >/dev/null 2>/dev/null
-       pngtopnm ship.png >ship.pnm
-       ./pnmoutline <ship.pnm >data/sprites/ship.pnm
-       pnmtopng -transparent =white data/sprites/ship.pnm >$@
-       rm ship.png ship.pnm data/sprites/ship.pnm
+include gfx.mk
 
 clean:
-       rm -f *.o vor pnmoutline data/sprites/ship.png
+       rm -f *.o vor $(graphics)
 
 install:       all
        if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi