Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
vor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added a 48x48 version of the ship for use as an icon.
[vor.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3656113
..
3260367
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-30,7
+30,7
@@
cflags := $(sdl-cflags) $(paths) $(CFLAGS)
my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o
my_objects += main.o
my_objects := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o
my_objects += main.o
-libs := SFont.o
+libs := font.o
objects := $(libs) $(my_objects)
rocks := 00 01 02 03 04 05 06 07 08 09
objects := $(libs) $(my_objects)
rocks := 00 01 02 03 04 05 06 07 08 09
@@
-39,7
+39,7
@@
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
rocks := $(rocks:%=data/rock%.png)
rocks += 30 31 32 33 34 35 36 37 38 39
rocks += 40 41 42 43 44 45 46 47 48 49
rocks := $(rocks:%=data/rock%.png)
-graphics := data/ship.png data/life.png $(rocks)
+graphics := data/ship.png data/icon.png data/life.png data/font.png $(rocks)
INSTALL := install
INSTALL_PROGRAM := $(INSTALL) -o games -g games
INSTALL := install
INSTALL_PROGRAM := $(INSTALL) -o games -g games
@@
-63,7
+63,7
@@
program: vor
$(my_objects): config.h
$(my_objects): config.h
-SFont.o: SFont.h
+font.o: font.h
args.o: args.h
args.o: args.h
@@
-85,7
+85,7
@@
sprite.o: sprite.h common.h
vor: $(objects)
@echo linking $@ from $^
vor: $(objects)
@echo linking $@ from $^
- @$(CC) $(ldflags) -o $@ $^ $(LIBRARIES)
+ @$(CC) $^ $(ldflags) -o $@
include gfx.mk
include gfx.mk
@@
-101,14
+101,12
@@
program-clean:
rm -f *.o vor
data-clean:
rm -f *.o vor
data-clean:
- rm -f $(graphics)
+ rm -f $(graphics) font_guts font_guts.pov
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
- if [ ! -d $(DATA_PREFIX)/icons ]; then mkdir $(DATA_PREFIX)/icons; fi
rminstalldirs:
rminstalldirs:
- if [ -d $(DATA_PREFIX)/icons ]; then rmdir $(DATA_PREFIX)/icons; fi
if [ -d $(DATA_PREFIX) ]; then rmdir $(DATA_PREFIX); fi
install: all mkinstalldirs install-program install-data
if [ -d $(DATA_PREFIX) ]; then rmdir $(DATA_PREFIX); fi
install: all mkinstalldirs install-program install-data
@@
-117,8
+115,12
@@
install-program: program
$(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
install-data: data
$(INSTALL_PROGRAM) ./vor $(PROGRAM_PREFIX)
install-data: data
- $(INSTALL_DATA) ./data/* $(DATA_PREFIX)/
- $(INSTALL_DATA) ./data/icons/* $(DATA_PREFIX)/icons/
+ $(INSTALL_DATA) ./data/*.png $(DATA_PREFIX)/
+ $(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
+ $(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
+ @echo
+ @echo "$(DATA_PREFIX)/icon.png (48x48) or ship.png (32x32) make good icons."
+ @echo
uninstall: uninstall-program uninstall-data rminstalldirs
uninstall: uninstall-program uninstall-data rminstalldirs
@@
-126,5
+128,6
@@
uninstall-program:
rm -f $(PROGRAM_PREFIX)/vor
uninstall-data:
rm -f $(PROGRAM_PREFIX)/vor
uninstall-data:
- rm -f $(DATA_PREFIX)/*
- rm -f $(DATA_PREFIX)/icons/*
+ rm -f $(DATA_PREFIX)/*.png
+ rm -f $(DATA_PREFIX)/*.wav
+ rm -f $(DATA_PREFIX)/*.mod