X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=a68701211308653e2e578bae34794c3b14b24262;hp=764ad9d12285d2606ae7ecefbdda2c369ad9160d;hb=8b7d7ca6a99b08200b0e7684c4d8ef3040c46c87;hpb=95432d94ee6d5cd0c1f71c36b78e195f1b96892f

diff --git a/Makefile.dj b/Makefile.dj
index 764ad9d..a687012 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,6 +1,6 @@
 src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-asmsrc = $(wildcard src/*.asm)
-obj = $(src:.c=.cof)
+asmsrc = $(wildcard src/*.asm) $(wildcard src/dos/*.asm)
+obj = $(src:.c=.cof) $(asmsrc:.asm=.cof)
 dep = $(obj:.cof=.dep)
 bin = demo.exe
 
@@ -11,16 +11,17 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/mikmod/include
-opt = -O3 -ffast-math
+inc = -Isrc -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
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = -pedantic -Wall -march=pentium $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.dja libs/mikmod/dos/libmikmod.a
+CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(inc)
+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
@@ -38,6 +39,10 @@ $(bin): $(obj) imago mikmod
 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
@@ -45,6 +50,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