X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=9845ce275ce688a492c702ddcb22820b9dae2353;hp=3d56856aef20ad91801e9cb0a19c5b50296a6279;hb=100da5f0dbf2d9edbc65d6308f9481ca2e4f55df;hpb=17fa4a9ede6e783b149702da0d9cce3048b312e5

diff --git a/Makefile b/Makefile
index 3d56856..9845ce2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,9 @@
-baseobj = main.obj
-demoobj = demo.obj screen.obj music.obj gfxutil.obj 3dgfx.obj polyfill.obj
-scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.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 dynarr.obj mesh.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
 obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
 bin = demo.exe
 
@@ -14,9 +16,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 +47,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 +60,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)