X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=9306382cbd0610f91f163d7d97df2a8028fd7edf;hp=2088717232d6d461202889f17edf3dfd6e999a76;hb=4b1cef5f03023a4977c1a0dd0e7464fd4cc1044c;hpb=77e0277af0c00dae78c7a739b2ca70cc19fd041a

diff --git a/Makefile.dj b/Makefile.dj
index 2088717..9306382 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,5 +1,5 @@
-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
@@ -11,7 +11,7 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs/imago/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
@@ -19,26 +19,33 @@ warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
 CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/mikmod/dos/libmikmod.a
+LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja libs/mikmod/dos/libmikmod.a
 
-$(bin): $(obj) imago mikmod
+$(bin): $(obj) imago anim mikmod
 	$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
 
 %.cof: %.asm
 	nasm -f coff -o $@ $<
 
+ifneq ($(hostsys), dos)
 -include $(dep)
+endif
 
 %.cof: %.c
 	$(CC) $(CFLAGS) -o $@ -c $<
 
 %.dep: %.c
+	@echo dep $@
 	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
 
 .PHONY: imago
 imago:
 	$(MAKE) -C libs/imago -f Makefile.dj
 
+.PHONY: anim
+anim:
+	$(MAKE) -C libs/anim -f Makefile.dj
+
 .PHONY: mikmod
 mikmod:
 	$(MAKE) -C libs/mikmod/dos -f Makefile.dj
@@ -46,6 +53,7 @@ mikmod:
 .PHONY: cleanlibs
 cleanlibs:
 	$(MAKE) -C libs/imago -f Makefile.dj clean
+	$(MAKE) -C libs/anim -f Makefile.dj clean
 	$(MAKE) -C libs/mikmod/dos -f Makefile.dj clean
 
 .PHONY: clean