projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added csprite stuff to the djgpp makefile
[dosdemo]
/
Makefile.dj
diff --git
a/Makefile.dj
b/Makefile.dj
index
a687012
..
b5c42bb
100644
(file)
--- a/
Makefile.dj
+++ b/
Makefile.dj
@@
-1,9
+1,11
@@
-src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-asmsrc = $(wildcard src/*.asm) $(wildcard src/dos/*.asm)
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/dos/*.c)
+asmsrc = $(wildcard src/*.asm) $(wildcard src/scr/*.asm) $(wildcard src/dos/*.asm)
obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
dep = $(obj:.cof=.dep)
bin = demo.exe
obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
dep = $(obj:.cof=.dep)
bin = demo.exe
+asmsrc += font.asm
+
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
else
ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
hostsys = dos
else
@@
-11,7
+13,7
@@
else
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
TOOLPREFIX = i586-pc-msdosdjgpp-
endif
-inc = -Isrc -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src -Ilibs/mikmod/include
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
opt = -O3 -ffast-math -fno-strict-aliasing
dbg = -g
warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
@@
-27,12
+29,15
@@
$(bin): $(obj) imago anim mikmod
%.cof: %.asm
nasm -f coff -o $@ $<
%.cof: %.asm
nasm -f coff -o $@ $<
+ifneq ($(hostsys), dos)
-include $(dep)
-include $(dep)
+endif
%.cof: %.c
$(CC) $(CFLAGS) -o $@ -c $<
%.dep: %.c
%.cof: %.c
$(CC) $(CFLAGS) -o $@ -c $<
%.dep: %.c
+ @echo dep $@
@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
.PHONY: imago
@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
.PHONY: imago
@@
-72,3
+77,10
@@
clean:
cleandep:
rm -f $(dep)
endif
cleandep:
rm -f $(dep)
endif
+
+
+tools/csprite/csprite:
+ $(MAKE) -C tools/csprite
+
+font.asm: data/legible.fnt tools/csprite/csprite
+ tools/csprite/csprite -n cs_font -s 8x16 -conv565 -nasm $< >$@