Merge branch 'master' of goat:git/dosdemo

diff --combined Makefile
index f17893e,f0bca5b..d907287
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  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
+ 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
  obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
  bin = demo.exe
@@@ -14,11 -14,9 +14,11 @@@ dbg = -d
  !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
@@@ -45,9 -43,6 +45,9 @@@ cflags.occ: Makefil
  cxxflags.occ: Makefile
        %write $@ $(CXXFLAGS)
  
 +music.obj: music.c
 +      $(CC) -fo=$@ @cflags.occ -zu $[*
 +
  .c.obj: .autodepend
        $(CC) -fo=$@ @cflags.occ $[*
  
@@@ -58,7 -53,7 +58,7 @@@
        $(AS) $(ASFLAGS) -o $@ $[*.asm
  
  clean: .symbolic
 -      del *.obj
 -      del *.occ
 -      del *.lnk
 -      del $(bin)
 +      $(RM) *.obj
 +      $(RM) *.occ
 +      $(RM) *.lnk
 +      $(RM) $(bin)