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 Makefile.win_cross for cross-compiling the windows binary on linux
[vor.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
8538a9f
..
840adfe
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-28,7
+28,7
@@
sdl-ldflags := $(shell sdl-config --libs)
ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
cflags := $(sdl-cflags) $(paths) $(CFLAGS)
ldflags := $(sdl-ldflags) -lSDL_image -lSDL_mixer $(LDFLAGS)
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 := args.o dust.o file.o mt.o rocks.o score.o sprite.o sound.o autopilot.o
my_objects += main.o
libs := font.o
objects := $(libs) $(my_objects)
my_objects += main.o
libs := font.o
objects := $(libs) $(my_objects)
@@
-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 data/font.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
@@
-67,11
+67,11
@@
font.o: font.h
args.o: args.h
args.o: args.h
-dust.o: globals.h dust.h mt.h
+dust.o: globals.h dust.h float.h mt.h
file.o: file.h common.h
file.o: file.h common.h
-main.o: args.h common.h dust.h file.h globals.h mt.h rocks.h score.h sprite.h sound.h
+main.o: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h
mt.o: mt.h
mt.o: mt.h
@@
-119,7
+119,7
@@
install-data: data
$(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
$(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
@echo
$(INSTALL_DATA) ./data/*.wav $(DATA_PREFIX)/
$(INSTALL_DATA) ./data/*.mod $(DATA_PREFIX)/
@echo
- @echo "We recommend using $(DATA_PREFIX)/ship.png as an icon."
+ @echo "$(DATA_PREFIX)/icon.png (48x48) or ship.png (32x32) make good icons."
@echo
uninstall: uninstall-program uninstall-data rminstalldirs
@echo
uninstall: uninstall-program uninstall-data rminstalldirs