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
storing font template uncompressed, updated gfx.mk appropriately.
[vor.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
90e50a6
..
e94a765
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/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
@@
-98,10
+98,10
@@
clean: program-clean
maintainer-clean: program-clean data-clean
program-clean:
maintainer-clean: program-clean data-clean
program-clean:
- rm -f *.o vor
+ rm -f *.o vor font_guts font_guts.pov
data-clean:
data-clean:
- rm -f $(graphics)
+ rm -f $(graphics) font_guts.pov
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi
mkinstalldirs:
if [ ! -d $(DATA_PREFIX) ]; then mkdir $(DATA_PREFIX); fi