X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=562b0d6314155bc28a10dab1557c0fdc82d3835f;hp=3a84c1ae226e509763f6d11aa814dee68bbdab17;hb=dcc815e69d92ecf20b063e38903bcedee7a19f2d;hpb=9b942b99fe10222bee50c47bfc809de268d331ec

diff --git a/Makefile b/Makefile
index 3a84c1a..562b0d6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,66 +1,98 @@
-demoobj = main.obj demo.obj screen.obj cfgopt.obj music.obj gfxutil.obj &
-3dgfx.obj polyfill.obj polyclip.obj metasurf.obj dynarr.obj
-scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.obj bump.obj &
-thunder.obj metaball.obj greets.obj
-sysobj = gfx.obj vbe.obj watdpmi.obj timer.obj keyb.obj mouse.obj sball.obj &
-logger.obj tinyfps.obj
-obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
-bin = demo.exe
+!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/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 &
+	src/rbtree.obj src/screen.obj src/tinyfps.obj src/treestor.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
 
-libs = imago.lib mikmod.lib
+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
+!else
 
-def = -dM_PI=3.141592653589793
-opt = -5 -fp5 -otexan -oh -oi -ei
-dbg = -d1
+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\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 &
+	src\rbtree.obj src\screen.obj src\tinyfps.obj src\treestor.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
 
-!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
+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) $(csprobj)
+bin = demo.exe
+
+opt = -otexan
+#opt = -od
+def = -dM_PI=3.141592653589793 -dUSE_HLT -dNO_SOUND
+libs = imago.lib anim.lib
+# midas.lib
+
 AS = nasm
 CC = wcc386
-CXX = wpp386
-ASFLAGS = -fobj
-CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
-CXXFLAGS = $(CFLAGS)
-LDFLAGS = option stack=16k option map $(libpath) library { $(libs) }
 LD = wlink
+ASFLAGS = -fobj
+CFLAGS = -d3 -5 -fp5 $(opt) $(def) -s -zq -bt=dos $(incpath)
+LDFLAGS = option map $(libpath) library { $(libs) }
 
-$(bin): cflags.occ $(obj) libs/imago/imago.lib
+$(bin): cflags.occ $(obj) libs/imago/imago.lib libs/anim/anim.lib
 	%write objects.lnk $(obj)
 	%write ldflags.lnk $(LDFLAGS)
 	$(LD) debug all name $@ system dos4g file { @objects } @ldflags
 
-.c: src;src/dos
-.cc: src;src/dos
-.asm: src;src/dos
+.c: src;src/dos;src/3dgfx;src/scr;cspr
+.asm: src;src/dos;src/3dgfx;src/scr;cspr
 
 cflags.occ: Makefile
 	%write $@ $(CFLAGS)
 
-cxxflags.occ: Makefile
-	%write $@ $(CXXFLAGS)
-
-music.obj: music.c
+!ifdef __UNIX__
+src/dos/audos.obj: src/dos/audos.c
+!else
+src\dos\audos.obj: src\dos\audos.c
+!endif
 	$(CC) -fo=$@ @cflags.occ -zu $[*
 
 .c.obj: .autodepend
 	$(CC) -fo=$@ @cflags.occ $[*
 
-.cc.obj: .autodepend
-	$(CXX) -fo=$@ @cxxflags.occ $[*
-
 .asm.obj:
-	$(AS) $(ASFLAGS) -o $@ $[*.asm
+	nasm -f obj -o $@ $[*.asm
 
+!ifdef __UNIX__
+clean: .symbolic
+	rm -f $(obj)
+	rm -f $(bin)
+	rm -f cflags.occ *.lnk
+!else
 clean: .symbolic
-	$(RM) *.obj
-	$(RM) *.occ
-	$(RM) *.lnk
-	$(RM) $(bin)
+	del src\*.obj
+	del src\dos\*.obj
+	del src\3dgfx\*.obj
+	del src\scr\*.obj
+	del *.lnk
+	del cflags.occ
+	del $(bin)
+!endif