X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=a018ddbf06afff24a6ffa3a225e61554735e8d68;hp=b5c42bba4d0852422c36d6032577a5101daa0f35;hb=b9ebecd3c02d5a5570d9b64190d76da78edb2d64;hpb=815504923a05c5f22a756b021997983e512474e1

diff --git a/Makefile.dj b/Makefile.dj
index b5c42bb..a018ddb 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -4,7 +4,7 @@ obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
 dep = $(obj:.cof=.dep)
 bin = demo.exe
 
-asmsrc += font.asm
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
 
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
 	hostsys = dos
@@ -16,15 +16,21 @@ endif
 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
+#prof = -pg
 warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
+CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(prof) $(inc)
 LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja libs/mikmod/dos/libmikmod.a
 
+ifneq ($(hostsys), dos)
+.PHONY: all
+all: data $(bin)
+endif
+
 $(bin): $(obj) imago anim mikmod
-	$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
+	$(CC) -o $@ -Wl,-Map=ld.map $(prof) $(obj) $(LDFLAGS)
 
 %.cof: %.asm
 	nasm -f coff -o $@ $<
@@ -76,11 +82,8 @@ clean:
 
 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 $< >$@
+.PHONY: data
+data:
+	@tools/procdata
+endif