- fixed typos in csprite's code generator for nasm

[dosdemo] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index d6c67d1..1ee0a1e 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,12 +1,22 @@
-src = $(wildcard src/*.c) $(wildcard src/sdl/*.c)
-obj = $(src:.c=.o)
+src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/sdl/*.c)
+obj = $(src:.c=.o) $(asmsrc:.asm=.o)
 dep = $(obj:.o=.d)
 bin = demo
 
-inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs/imago/src -Ilibs/mikmod/include
+asmsrc += font.asm
 
-CFLAGS = -pedantic -Wall -g $(inc) `sdl-config --cflags`
-LDFLAGS = -Llibs/imago -Llibs/mikmod -limago -lmikmod `sdl-config --libs` -lm
+inc = -I/usr/local/include -Isrc -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`
+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
+else
+       sdl_ldflags = `sdl-config --libs`
+endif
 
 $(bin): $(obj) imago mikmod
        $(CC) -o $@ $(obj) $(LDFLAGS)
@@ -17,6 +27,7 @@ $(bin): $(obj) imago mikmod
 -include $(dep)
 
 %.d: %.c
+       @echo dep $@
        @$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
 
 .PHONY: imago
@@ -29,8 +40,8 @@ mikmod:
 
 .PHONY: cleanlibs
 cleanlibs:
-       $(MAKE) -C libs/imago -f Makefile.dj clean
-       $(MAKE) -C libs/oldmik -f Makefile.dj clean
+       $(MAKE) -C libs/imago clean
+       $(MAKE) -C libs/mikmod clean
 
 .PHONY: clean
 clean:
@@ -39,3 +50,9 @@ clean:
 .PHONY: cleandep
 cleandep:
        rm -f $(dep)
+
+tools/csprite/csprite:
+       $(MAKE) -C tools/csprite
+
+font.asm: data/font.png tools/csprite/csprite
+       tools/csprite/csprite -n font -s 16x16 -r 288x32+32+17 -conv565 -nasm $< >$@