X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=f2414dcb7f27bb8d234eae50a7d4841db4835772;hp=600403a98fb2b36355eac96e2f9adbae57015b1f;hb=637ca39c29b03bd3a2beb99521753e83c043283f;hpb=0165ec15f868a16a70b56ada2d42db0cb69ea193

diff --git a/Makefile.dj b/Makefile.dj
index 600403a..f2414dc 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,8 +1,11 @@
-src = $(wildcard src/*.c) $(wildcard src/dos/*.c)
-obj = $(src:.c=.o)
-dep = $(obj:.o=.d)
+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
 
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
+
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
 	hostsys = dos
 else
@@ -10,52 +13,73 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
-opt = -O3 -ffast-math
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
+opt = -O3 -ffast-math -fno-strict-aliasing
 dbg = -g
+#prof = -pg
+warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
+def = -DNO_MUSIC
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = -pedantic -Wall $(dbg) $(opt) $(inc)
-LDFLAGS = libs/imago/imago.a libs/oldmik/mikmod.a
+CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(prof) $(inc) $(def)
+LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja
+
+ifneq ($(hostsys), dos)
+.PHONY: all
+all: data $(bin)
+endif
+
+$(bin): $(obj) imago anim
+	$(CC) -o $@ -Wl,-Map=ld.map $(prof) $(obj) $(LDFLAGS)
 
-$(bin): $(obj) imago 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 $<
 
-%.d: %.c
-	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.dep: %.c
+	@echo dep $@
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.cof) >$@
 
 .PHONY: imago
 imago:
 	$(MAKE) -C libs/imago -f Makefile.dj
 
-.PHONY: mikmod
-mikmod:
-	$(MAKE) -C libs/oldmik -f Makefile.dj
+.PHONY: anim
+anim:
+	$(MAKE) -C libs/anim -f Makefile.dj
 
 .PHONY: cleanlibs
 cleanlibs:
 	$(MAKE) -C libs/imago -f Makefile.dj clean
-	$(MAKE) -C libs/oldmik -f Makefile.dj clean
+	$(MAKE) -C libs/anim -f Makefile.dj clean
 
 .PHONY: clean
 .PHONY: cleandep
 
 ifeq ($(hostsys), dos)
 clean:
-	del src\*.o
-	del src\dos\*.o
+	del src\*.cof
+	del src\dos\*.cof
 	del $(bin)
 
 cleandep:
-	del src\*.d
-	del src\dos\*.d
+	del src\*.dep
+	del src\dos\*.dep
 else
 clean:
 	rm -f $(obj) $(bin)
 
 cleandep:
 	rm -f $(dep)
+
+.PHONY: data
+data:
+	@tools/procdata
 endif