X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=GNUmakefile;h=49fb3a17884dd744b1af54a5a771d80c34c0c0c7;hp=d6c67d1a805e2cfdb86909a301c62f4f98bd58aa;hb=0ce0f59d2afd26e0956716fae169075368020a02;hpb=e61875cfadc6ac33302d69474209fd215b9f6842

diff --git a/GNUmakefile b/GNUmakefile
index d6c67d1..49fb3a1 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -1,12 +1,27 @@
-src = $(wildcard src/*.c) $(wildcard src/sdl/*.c)
-obj = $(src:.c=.o)
+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
 
-inc = -I/usr/local/include -Isrc -Isrc/sdl -Ilibs/imago/src -Ilibs/mikmod/include
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
 
-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/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`
+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-1.2
+else
+	sdl_ldflags = `sdl-config --libs`
+endif
+
+.PHONY: all
+all: data $(bin)
 
 $(bin): $(obj) imago mikmod
 	$(CC) -o $@ $(obj) $(LDFLAGS)
@@ -14,9 +29,12 @@ $(bin): $(obj) imago mikmod
 %.o: %.asm
 	nasm -f elf -o $@ $<
 
+src/data.o: src/data.asm $(bindata)
+
 -include $(dep)
 
 %.d: %.c
+	@echo dep $@
 	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
 
 .PHONY: imago
@@ -29,8 +47,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 +57,7 @@ clean:
 .PHONY: cleandep
 cleandep:
 	rm -f $(dep)
+
+.PHONY: data
+data:
+	@tools/procdata