X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=b95f943097937db18a1409b993aae45f35a329e8;hp=575308c214fa8063b945b0215067c939549db7d4;hb=3398fc6c4188104048f99b650a6cb90beda9b6ed;hpb=5d599e487cdc3b172c8c7cd8fc2f91d6af8bd049

diff --git a/Makefile.dj b/Makefile.dj
index 575308c..b95f943 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -11,33 +11,41 @@ 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
 	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
@@ -45,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