X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=46757688d49615aee0c8a46c3fc1daac33a95c37;hp=810d2ca73bfbc8ffbd14de5fb019a5bb11fa545a;hb=b6c89d9ffbb08c5286448de4773290f0924a420b;hpb=695b69a4c4acbaee28d99851d711c00b2468e280

diff --git a/Makefile b/Makefile
index 810d2ca..4675768 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,10 @@
-baseobj = main.obj
-demoobj = demo.obj screen.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 watdpmi.obj
+
 bin = demo.exe
 
 libs = imago.lib
@@ -13,10 +15,12 @@ dbg = -d1
 
 !ifdef __UNIX__
 incpath = -Isrc -Isrc/dos -Ilibs/imago/src
-libpath = libs/imago
+libpath = libpath libs/imago
+RM = rm -f
 !else
 incpath = -Isrc -Isrc\dos -Ilibs\imago\src
-libpath = libs\imago
+libpath = libpath libs\imago
+RM = del
 !endif
 
 AS = nasm
@@ -25,12 +29,13 @@ CXX = wpp386
 ASFLAGS = -fobj
 CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
 CXXFLAGS = $(CFLAGS)
-LDFLAGS = libpath $(libpath) library { $(libs) }
+LDFLAGS = option stack=16k option map $(libpath) library { $(libs) }
 LD = wlink
 
 $(bin): cflags.occ $(obj) libs/imago/imago.lib
 	%write objects.lnk $(obj)
-	$(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
+	%write ldflags.lnk $(LDFLAGS)
+	$(LD) debug all name $@ system dos4g file { @objects } @ldflags
 
 .c: src;src/dos
 .cc: src;src/dos
@@ -52,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)