X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile.dj;h=59d404293dbed1d844477f28dbb6907ff22e5d11;hb=refs%2Fheads%2Fmaster;hp=e24955357563cccfcbab1ac1d8f3aef69d52d264;hpb=57bd2dc519c47f434e3e5acf998fb9c72448cbce;p=dosdemo

diff --git a/Makefile.dj b/Makefile.dj
index e249553..59d4042 100644
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -1,7 +1,8 @@
-src = $(wildcard src/*.c) $(wildcard src/scr/*.c) $(wildcard src/dos/*.c)
+src = $(wildcard src/*.c) $(wildcard src/3dgfx/*.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)
+dep = $(src:.c=.d)
 bin = demo.exe
 
 asmsrc += cspr/dbgfont.asm cspr/confont.asm
@@ -14,22 +15,24 @@ else
 	TOOLPREFIX = i586-pc-msdosdjgpp-
 endif
 
-inc = -Isrc -Isrc/scr -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
+inc = -Isrc -Isrc/3dgfx -Isrc/scr -Isrc/dos -Ilibs \
+	  -Ilibs/imago/src -Ilibs/anim/src -Ilibs/midas
 opt = -O3 -ffast-math -fno-strict-aliasing
 warn = -pedantic -Wall -Wno-unused-function -Wno-unused-variable
 
 ifdef RELEASE
 	dbg = -g
-	def = -DNDEBUG -DNO_MUSIC
+	def = -DNDEBUG -DNO_SOUND
 else
-	def = -DNO_MUSIC
+	def = -DNO_SOUND
 endif
 #prof = -pg
 
 CC = $(TOOLPREFIX)gcc
 AR = $(TOOLPREFIX)ar
-CFLAGS = $(warn) -march=pentium $(dbg) $(opt) $(prof) $(inc) $(def)
+CFLAGS = -march=pentium $(warn) -MMD $(dbg) $(opt) $(prof) $(inc) $(def)
 LDFLAGS = libs/imago/imago.dja libs/anim/anim.dja
+#libs/midas/libmidas.a
 
 ifneq ($(hostsys), dos)
 .PHONY: all
@@ -44,29 +47,23 @@ $(bin): $(obj) imago anim
 
 src/data.odj: src/data.asm $(bindata)
 
-ifneq ($(hostsys), dos)
 -include $(dep)
-endif
 
 %.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
+	$(MAKE) -C libs/imago -f Makefile.dj
 
 .PHONY: anim
 anim:
-	$(MAKE) -C libs/anim -f Makefile
+	$(MAKE) -C libs/anim -f Makefile.dj
 
 .PHONY: cleanlibs
 cleanlibs:
-	$(MAKE) -C libs/imago -f Makefile clean
-	$(MAKE) -C libs/anim -f Makefile clean
+	$(MAKE) -C libs/imago clean -f Makefile.dj
+	$(MAKE) -C libs/anim clean -f Makefile.dj
 
 .PHONY: clean
 .PHONY: cleandep
@@ -74,12 +71,14 @@ cleanlibs:
 ifeq ($(hostsys), dos)
 clean:
 	del src\*.odj
+	del src\3dgfx\*.odj
 	del src\dos\*.odj
 	del $(bin)
 
 cleandep:
-	del src\*.dep
-	del src\dos\*.dep
+	del src\*.d
+	del src\3dgfx\*.d
+	del src\dos\*.d
 else
 clean:
 	rm -f $(obj) $(bin)