X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;fp=Makefile;h=0b6a46010d4d74792c1e667bdbe71e305dc93638;hp=8a2db497d8a66527e83dd8fe74fd50c1d6c332c0;hb=b49854e0980a030cc8338a7f4ee779ecde1aae38;hpb=57bd2dc519c47f434e3e5acf998fb9c72448cbce

diff --git a/Makefile b/Makefile
index 8a2db49..0b6a460 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 !ifdef __UNIX__
 dosobj = src/dos/audos.obj src/dos/djdpmi.obj src/dos/gfx.obj src/dos/keyb.obj &
 	src/dos/logger.obj src/dos/main.obj src/dos/sball.obj src/dos/timer.obj &
-	src/dos/vbe.obj src/dos/vga.obj src/dos/watdpmi.obj
+	src/dos/vbe.obj src/dos/vga.obj src/dos/watdpmi.obj src/dos/mouse.obj
 3dobj = src/3dgfx/3dgfx.obj src/3dgfx/mesh.obj src/3dgfx/meshload.obj &
 	src/3dgfx/polyclip.obj src/3dgfx/polyfill.obj
-srcobj = src/bsptree.obj src/cfgopt.obj src/console.obj &
-	src/demo.obj src/dynarr.obj src/gfxutil.obj &
-	src/metasurf.obj src/noise.obj &
+srcobj = src/bsptree.obj src/cfgopt.obj src/console.obj src/demo.obj &
+	src/dynarr.obj src/gfxutil.obj src/metasurf.obj src/noise.obj &
 	src/rbtree.obj src/screen.obj src/tinyfps.obj src/treestor.obj &
-	src/ts_text.obj src/util.obj
+	src/ts_text.obj src/util.obj src/data.obj
 scrobj = src/scr/bump.obj src/scr/fract.obj src/scr/greets.obj &
 	src/scr/grise.obj src/scr/hairball.obj src/scr/infcubes.obj &
 	src/scr/metaball.obj src/scr/plasma.obj src/scr/polytest.obj &
 	src/scr/smoketxt.obj src/scr/thunder.obj src/scr/tilemaze.obj &
 	src/scr/tunnel.obj
+csprobj = cspr/dbgfont.obj cspr/confont.obj
 
 incpath = -Isrc -Isrc/dos -Isrc/3dgfx -Ilibs -Ilibs/imago/src -Ilibs/anim/src &
 	-Ilibs/midas
@@ -22,26 +22,26 @@ libpath = libpath libs/imago libpath libs/anim libpath libs/midas
 
 dosobj = src\dos\audos.obj src\dos\djdpmi.obj src\dos\gfx.obj src\dos\keyb.obj &
 	src\dos\logger.obj src\dos\main.obj src\dos\sball.obj src\dos\timer.obj &
-	src\dos\vbe.obj src\dos\vga.obj src\dos\watdpmi.obj
+	src\dos\vbe.obj src\dos\vga.obj src\dos\watdpmi.obj src\dos\mouse.obj
 3dobj = src\3dgfx\3dgfx.obj src\3dgfx\mesh.obj src\3dgfx\meshload.obj &
 	src\3dgfx\polyclip.obj src\3dgfx\polyfill.obj
-srcobj = src\3dgfx.obj src\bsptree.obj src\cfgopt.obj src\console.obj &
-	src\demo.obj src\dynarr.obj src\gfxutil.obj src\mesh.obj src\meshload.obj &
-	src\metasurf.obj src\noise.obj src\polyclip.obj src\polyfill.obj &
+srcobj = src\bsptree.obj src\cfgopt.obj src\console.obj src\demo.obj &
+	src\dynarr.obj src\gfxutil.obj src\metasurf.obj src\noise.obj &
 	src\rbtree.obj src\screen.obj src\tinyfps.obj src\treestor.obj &
-	src\ts_text.obj src\util.obj
+	src\ts_text.obj src\util.obj src\data.obj
 scrobj = src\scr\bump.obj src\scr\fract.obj src\scr\greets.obj &
 	src\scr\grise.obj src\scr\hairball.obj src\scr\infcubes.obj &
 	src\scr\metaball.obj src\scr\plasma.obj src\scr\polytest.obj &
 	src\scr\smoketxt.obj src\scr\thunder.obj src\scr\tilemaze.obj &
 	src\scr\tunnel.obj
+csprobj = cspr\dbgfont.obj cspr\confont.obj
 
 incpath = -Isrc -Isrc\dos -Isrc\3dgfx -Ilibs -Ilibs\imago\src -Ilibs\anim\src &
 	-Ilibs\midas
 libpath = libpath libs\imago libpath libs\anim libpath libs\midas
 !endif
 
-obj = $(dosobj) $(3dobj) $(scrobj) $(srcobj)
+obj = $(dosobj) $(3dobj) $(scrobj) $(srcobj) $(csprobj)
 bin = demo.exe
 
 opt = -otexan
@@ -61,8 +61,8 @@ $(bin): cflags.occ $(obj) libs/imago/imago.lib libs/anim/anim.lib
 	%write ldflags.lnk $(LDFLAGS)
 	$(LD) debug all name $@ system dos4g file { @objects } @ldflags
 
-.c: src;src/dos;src/3dgfx;src/scr
-.asm: src;src/dos;src/3dgfx;src/scr
+.c: src;src/dos;src/3dgfx;src/scr;cspr
+.asm: src;src/dos;src/3dgfx;src/scr;cspr
 
 cflags.occ: Makefile
 	%write $@ $(CFLAGS)