X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile.dj;h=e24955357563cccfcbab1ac1d8f3aef69d52d264;hp=ed1a830638da4928b534240a6aec8d9de9a41ca3;hb=b49854e0980a030cc8338a7f4ee779ecde1aae38;hpb=62c84af3483abd59e3b6672559b19a9ea17ff14d

diff --git a/Makefile.dj b/Makefile.dj
index ed1a830..e249553 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,8 +1,12 @@
-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=.odj) $(asmsrc:.asm=.odj)
+dep = $(obj:.odj=.dep)
 bin = demo.exe
 
+asmsrc += cspr/dbgfont.asm cspr/confont.asm
+bindata = data/loading.img
+
 ifeq ($(findstring COMMAND.COM, $(SHELL)), COMMAND.COM)
 	hostsys = dos
 else
@@ -10,52 +14,84 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
-opt = -O3 -ffast-math
-dbg = -g
+inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
+opt = -O3 -ffast-math -fno-strict-aliasing
+warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
+
+ifdef RELEASE
+	dbg = -g
+	def = -DNDEBUG -DNO_MUSIC
+else
+	def = -DNO_MUSIC
+endif
+#prof = -pg
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = -pedantic -Wall -march=pentium $(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 mikmod
-	$(CC) -o $@ -Wl,-Map=ld.map $(obj) $(LDFLAGS)
+$(bin): $(obj) imago anim
+	$(CC) -o $@ -Wl,-Map=ld.map $(prof) $(obj) $(LDFLAGS)
 
+%.odj: %.asm
+	nasm -f coff -o $@ $<
+
+src/data.odj: src/data.asm $(bindata)
+
+ifneq ($(hostsys), dos)
 -include $(dep)
+endif
 
-%.d: %.c
-	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.d=.o) >$@
+%.odj: %.c
+	$(CC) $(CFLAGS) -o $@ -c $<
+
+%.dep: %.c
+	@echo dep $@
+	@$(CPP) $(CFLAGS) $< -MM -MT $(@:.dep=.odj) >$@
 
 .PHONY: imago
 imago:
-	$(MAKE) -C libs/imago -f Makefile.dj
+	$(MAKE) -C libs/imago -f Makefile
 
-.PHONY: mikmod
-mikmod:
-	$(MAKE) -C libs/oldmik -f Makefile.dj
+.PHONY: anim
+anim:
+	$(MAKE) -C libs/anim -f Makefile
 
 .PHONY: cleanlibs
 cleanlibs:
-	$(MAKE) -C libs/imago -f Makefile.dj clean
-	$(MAKE) -C libs/oldmik -f Makefile.dj clean
+	$(MAKE) -C libs/imago -f Makefile clean
+	$(MAKE) -C libs/anim -f Makefile clean
 
 .PHONY: clean
 .PHONY: cleandep
 
 ifeq ($(hostsys), dos)
 clean:
-	del src\*.o
-	del src\dos\*.o
+	del src\*.odj
+	del src\dos\*.odj
 	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
+
+.PHONY: strip
+strip: $(bin)
+	$(TOOLPREFIX)strip $(bin)