* rocks.c (hit_rock, pixel_hit_rock): fix more possible bugs.

[vor.git] / Makefile

diff --git a/Makefile b/Makefile
index 943059a..f8f4dd7 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,16 +18,18 @@
 DATA_PREFIX := /usr/share/vor
 PROGRAM_PREFIX := /usr/games/bin
 
-debug := $(if $(DEBUG),-DDEBUG=1)
+CFLAGS := -Wall
+LDFLAGS := 
+
 paths := -DDATA_PREFIX=\"$(DATA_PREFIX)\"
 sdl-cflags := $(shell sdl-config --cflags)
 sdl-ldflags := $(shell sdl-config --libs)
 
-ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer
-cflags := $(sdl-cflags) $(debug) $(paths) $(CFLAGS)
+ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
+cflags := $(sdl-cflags) $(paths) $(CFLAGS)
 
-my_objects := args.o file.o rocks.o score.o shape.o sound.o
-my_objects += $(if $(DEBUG),debug.o) main.o
+my_objects := args.o dust.o file.o mt.o rocks.o score.o shape.o sound.o
+my_objects += main.o
 libs := SFont.o
 objects := $(libs) $(my_objects)
 
@@ -69,7 +71,11 @@ vor: $(objects)
 
 include gfx.mk
 
+tags: *.c *.h
+       exuberant-ctags *.c *.h /usr/include/SDL/*
+
 clean: program-clean
+       rm -f tags
 
 maintainer-clean: program-clean data-clean
 
@@ -112,8 +118,6 @@ install-data: data
        $(INSTALL_DATA) ./data/music/* $(DATA_PREFIX)/music/
        $(INSTALL_DATA) ./data/sounds/* $(DATA_PREFIX)/sounds/
        $(INSTALL_DATA) ./data/sprites/* $(DATA_PREFIX)/sprites/
-       touch $(DATA_PREFIX)/scores
-       chmod a+rw $(DATA_PREFIX)/scores
 
 uninstall: uninstall-program uninstall-data rminstalldirs
 
@@ -128,4 +132,4 @@ uninstall-data:
        rm -f $(DATA_PREFIX)/music/*
        rm -f $(DATA_PREFIX)/sounds/*
        rm -f $(DATA_PREFIX)/sprites/*
-       rm -f $(DATA_PREFIX)/scores $(DATA_PREFIX)/.highscore
+       rm -f $(DATA_PREFIX)/scores