fixed compiled sprites

[dosdemo] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index d0eec53..49fb3a1 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,11 +1,13 @@
 src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/sdl/*.c)
+asmsrc = $(wildcard src/*.asm)
 obj = $(src:.c=.o) $(asmsrc:.asm=.o)
 dep = $(obj:.o=.d)
 bin = demo
 
-asmsrc += font.asm
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
 
-inc = -I/usr/local/include -Isrc -Isrc/scr -Isrc/sdl -Ilibs -Ilibs/imago/src -Ilibs/mikmod/include
+inc = -I/usr/local/include -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/sdl -Ilibs -Ilibs/imago/src -Ilibs/mikmod/include
 warn = -pedantic -Wall -Wno-unused-variable -Wno-unused-function
 
 CFLAGS = $(arch) $(warn) -g $(inc) `sdl-config --cflags`
@@ -13,17 +15,22 @@ LDFLAGS = $(arch) -Llibs/imago -Llibs/mikmod -limago -lmikmod $(sdl_ldflags) -lm
 
 ifneq ($(shell uname -m), i386)
        arch = -m32
-       sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL
+       sdl_ldflags = -L/usr/lib/i386-linux-gnu -lSDL-1.2
 else
        sdl_ldflags = `sdl-config --libs`
 endif
 
+.PHONY: all
+all: data $(bin)
+
 $(bin): $(obj) imago mikmod
        $(CC) -o $@ $(obj) $(LDFLAGS)
 
 %.o: %.asm
        nasm -f elf -o $@ $<
 
+src/data.o: src/data.asm $(bindata)
+
 -include $(dep)
 
 %.d: %.c
@@ -51,8 +58,6 @@ clean:
 cleandep:
        rm -f $(dep)
 
-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