X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=blobdiff_plain;f=Makefile;h=d90728705aee407efa3e99538cc1790b631c016c;hp=6e73142f5ffdd9b5b0ab60c17ec7c294309f3448;hb=d00f30ccdcfe52d50a08b15748734b3503fae734;hpb=77db1ca18d5446dcda9e524261399b63c2cd1813

diff --git a/Makefile b/Makefile
index 6e73142..d907287 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
-baseobj = main.obj
-demoobj = demo.obj screen.obj music.obj gfxutil.obj 3dgfx.obj polyfill.obj
-scrobj = tunnel.obj fract.obj grise.obj polytest.obj plasma.obj
+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 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,9 +14,11 @@ dbg = -d1
 !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
@@ -25,7 +27,7 @@ CXX = wpp386
 ASFLAGS = -fobj
 CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
 CXXFLAGS = $(CFLAGS)
-LDFLAGS = $(libpath) library { $(libs) }
+LDFLAGS = option stack=16k option map $(libpath) library { $(libs) }
 LD = wlink
 
 $(bin): cflags.occ $(obj) libs/imago/imago.lib
@@ -43,6 +45,9 @@ cflags.occ: Makefile
 cxxflags.occ: Makefile
 	%write $@ $(CXXFLAGS)
 
+music.obj: music.c
+	$(CC) -fo=$@ @cflags.occ -zu $[*
+
 .c.obj: .autodepend
 	$(CC) -fo=$@ @cflags.occ $[*
 
@@ -53,7 +58,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)