projects
/
eradicate
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added readme with data checkout instructions, and changed the paths in
[eradicate]
/
GNUmakefile
diff --git
a/GNUmakefile
b/GNUmakefile
index
817daff
..
73f7938
100644
(file)
--- a/
GNUmakefile
+++ b/
GNUmakefile
@@
-1,12
+1,15
@@
csrc = $(wildcard src/*.c) $(wildcard src/sdl/*.c) $(wildcard src/3dgfx/*.c)
csrc = $(wildcard src/*.c) $(wildcard src/sdl/*.c) $(wildcard src/3dgfx/*.c)
+asmsrc = $(wildcard src/*.asm)
-obj = $(csrc:.c=.o)
+obj = $(csrc:.c=.o) $(asmsrc:.asm=.o)
dep = $(obj:.o=.d)
bin = game
dep = $(obj:.o=.d)
bin = game
+def = -DUSE_MMX
inc = -Isrc -Isrc/sdl -Isrc/3dgfx -Ilibs/imago/src
inc = -Isrc -Isrc/sdl -Isrc/3dgfx -Ilibs/imago/src
+warn = -pedantic -Wall
-CFLAGS = $(arch) -pedantic -Wall -g -MMD $(inc) `sdl-config --cflags`
+CFLAGS = $(arch) $(warn) -g -MMD $(def) $(inc) `sdl-config --cflags`
LDFLAGS = $(arch) -Llibs/imago -limago $(sdl_ldflags) -lm
ifneq ($(shell uname -m), i386)
LDFLAGS = $(arch) -Llibs/imago -limago $(sdl_ldflags) -lm
ifneq ($(shell uname -m), i386)
@@
-16,10
+19,15
@@
else
sdl_ldflags = `sdl-config --libs`
endif
sdl_ldflags = `sdl-config --libs`
endif
+.PHONY: all
+all: $(bin)
$(bin): $(obj) imago
$(CC) -o $@ $(obj) $(LDFLAGS)
$(bin): $(obj) imago
$(CC) -o $@ $(obj) $(LDFLAGS)
+%.o: %.asm
+ nasm -f elf -o $@ $<
+
-include $(dep)
.PHONY: imago
-include $(dep)
.PHONY: imago
@@
-33,3
+41,7
@@
clean:
.PHONY: cleandep
cleandep:
rm -f $(dep)
.PHONY: cleandep
cleandep:
rm -f $(dep)
+
+.PHONY: data
+data:
+ @tools/procdata