fixed crashing bug in move_dust() (bounds checking wasn't right)

[vor.git] / Makefile

diff --git a/Makefile b/Makefile
index 3656113..dacecb6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 DATA_PREFIX := /usr/share/vor
 PROGRAM_PREFIX := /usr/games/bin
 
-CFLAGS := -Wall -O3
+CFLAGS := -ggdb
 LDFLAGS := 
 
 paths := -DDATA_PREFIX=\"$(DATA_PREFIX)\"
@@ -58,8 +58,8 @@ data: $(graphics)
 program: vor
 
 %.o: %.c
-       @echo compiling $@ from $<
-       @$(CC) $(cflags) -c -o $@ $<
+       #@echo compiling $@ from $<
+       $(CC) $(cflags) -c -o $@ $<
 
 $(my_objects): config.h
 
@@ -85,7 +85,7 @@ sprite.o: sprite.h common.h
 
 vor: $(objects)
        @echo linking $@ from $^
-       @$(CC) $(ldflags) -o $@ $^ $(LIBRARIES)
+       @$(CC) $^ $(ldflags) -o $@
 
 include gfx.mk
 
@@ -117,7 +117,9 @@ install-program: program
        $(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
 
 install-data: data
-       $(INSTALL_DATA) ./data/* $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.png $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
+       $(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
        $(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
 
 uninstall: uninstall-program uninstall-data rminstalldirs
@@ -126,5 +128,7 @@ uninstall-program:
        rm -f $(PROGRAM_PREFIX)/vor
 
 uninstall-data:
-       rm -f $(DATA_PREFIX)/*
+       rm -f $(DATA_PREFIX)/*.png
+       rm -f $(DATA_PREFIX)/*.wav
+       rm -f $(DATA_PREFIX)/*.mod
        rm -f $(DATA_PREFIX)/icons/*