X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=2faa385d952bb33077b0ea7d49e863cff33ed2d5;hp=e13b685547f05ea8d7414cf37402176c09ab9019;hb=102f82ec5a8128cb076371aa3d9821e684b94380;hpb=09de8aabb6f284df52898f4f133fd810bb10c79e

diff --git a/Makefile b/Makefile
index e13b685..2faa385 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,26 @@
-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
-sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj tinyfps.obj
-obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
+obj = 3dgfx.obj bsptree.obj bump.obj cfgopt.obj demo.obj djdpmi.obj dynarr.obj &
+fract.obj gfx.obj gfxutil.obj greets.obj grise.obj hairball.obj infcubes.obj &
+keyb.obj logger.obj main.obj mesh.obj meshload.obj metaball.obj metasurf.obj &
+mouse.obj music.obj noise.obj plasma.obj polyclip.obj polyfill.obj polytest.obj &
+rbtree.obj sball.obj screen.obj smoketxt.obj thunder.obj tilemaze.obj timer.obj &
+tinyfps.obj treestor.obj ts_text.obj tunnel.obj util.obj vbe.obj vga.obj
+
 bin = demo.exe
 
-libs = imago.lib mikmod.lib
+libs = imago.lib anim.lib
 
 def = -dM_PI=3.141592653589793
 opt = -5 -fp5 -otexan -oh -oi -ei
-dbg = -d1
+dbg = -d2
 
 !ifdef __UNIX__
-incpath = -Isrc -Isrc/dos -Ilibs/imago/src -Ilibs/oldmik/src
-libpath = libpath libs/imago libpath libs/oldmik
+incpath = -Isrc -Isrc/dos -Ilibs -Ilibs/imago/src -Ilibs/anim/src
+libpath = libpath libs/imago libpath libs/anim
+RM = rm -f
 !else
-incpath = -Isrc -Isrc\dos -Ilibs\imago\src -Ilibs\oldmik\src
-libpath = libpath libs\imago libpath libs\oldmik
+incpath = -Isrc -Isrc\dos -Ilibs -Ilibs\imago\src -Ilibs\anim\src
+libpath = libpath libs\imago libpath libs\anim
+RM = del
 !endif
 
 AS = nasm
@@ -53,7 +57,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)