X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=9f9a98ef8399b7ef072f360c76a9a9c0fe911f29;hp=f0bca5bdc1019e964d77765cd01b15d55626f09f;hb=a5c65ceb155188c8acee31a475f8db9f5b58f4b6;hpb=250a4161b7aaacca5ca30562afe9547c64d6d0d5

diff --git a/Makefile b/Makefile
index f0bca5b..9f9a98e 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,10 @@
-demoobj = main.obj demo.obj screen.obj cfgopt.obj music.obj gfxutil.obj 3dgfx.obj &
-polyfill.obj
-scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.obj bump.obj
-sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj tinyfps.obj
+demoobj = main.obj demo.obj screen.obj cfgopt.obj music.obj gfxutil.obj &
+3dgfx.obj polyfill.obj polyclip.obj metasurf.obj mesh.obj meshload.obj &
+bsptree.obj
+scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.obj bump.obj &
+thunder.obj metaball.obj greets.obj infcubes.obj
+sysobj = gfx.obj vbe.obj watdpmi.obj timer.obj keyb.obj mouse.obj sball.obj &
+logger.obj tinyfps.obj util.obj dynarr.obj rbtree.obj
 obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
 bin = demo.exe
 
@@ -14,9 +17,11 @@ dbg = -d1
 !ifdef __UNIX__
 incpath = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
 libpath = libpath libs/imago libpath libs/oldmik
+RM = rm -f
 !else
 incpath = -Isrc -Isrc\dos -Ilibs\imago\src -Ilibs\oldmik\src
 libpath = libpath libs\imago libpath libs\oldmik
+RM = del
 !endif
 
 AS = nasm
@@ -43,6 +48,9 @@ cflags.occ: Makefile
 cxxflags.occ: Makefile
 	%write $@ $(CXXFLAGS)
 
+music.obj: music.c
+	$(CC) -fo=$@ @cflags.occ -zu $[*
+
 .c.obj: .autodepend
 	$(CC) -fo=$@ @cflags.occ $[*
 
@@ -53,7 +61,7 @@ cxxflags.occ: Makefile
 	$(AS) $(ASFLAGS) -o $@ $[*.asm
 
 clean: .symbolic
-	del *.obj
-	del *.occ
-	del *.lnk
-	del $(bin)
+	$(RM) *.obj
+	$(RM) *.occ
+	$(RM) *.lnk
+	$(RM) $(bin)