X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=9ff0e5838712d28667eec79bd8dd9316b23f0dce;hb=26db2e08470629e79e0afe76c2fcbb3b4e10a01d;hp=6cb64ca8c64e9f28844e000634399cc959049b5c;hpb=1ee7845621c04020321fa8dfb6dcbf3d8c6c9b51;p=eradicate

diff --git a/Makefile b/Makefile
index 6cb64ca..9ff0e58 100644
--- a/Makefile
+++ b/Makefile
@@ -2,37 +2,49 @@
 dosobj = src/dos/main.obj src/dos/gfx.obj src/dos/timer.obj src/dos/watdpmi.obj &
 		 src/dos/vbe.obj src/dos/vga.obj src/dos/keyb.obj src/dos/mouse.obj &
 		 src/dos/logger.obj
-gameobj = src/game.obj src/util.obj src/gfxutil.obj src/menuscr.obj
+scrobj = src/introscr.obj src/menuscr.obj
+gameobj = src/game.obj src/util.obj src/gfxutil.obj src/dynarr.obj src/rbtree.obj
+gfxobj = src/3dgfx/3dgfx.obj src/3dgfx/mesh.obj src/3dgfx/meshload.obj &
+		src/3dgfx/polyfill.obj src/3dgfx/polyclip.obj src/sprite.obj
 incpath = -Isrc -Isrc/dos -Ilibs/imago/src
 libpath = libpath libs/imago
 !else
-dosobj = src\dos\main.obj src\dos\gfx.obj src\dos\timer.obj src\dos\watdpmi.obj &
-		 src\dos\vbe.obj src\dos\vga.obj src\dos\keyb.obj src\dos\mouse.obj &
-		 src\dos\logger.obj
-gameobj = src\game.obj src\util.obj src\gfxutil.obj src\menuscr.obj
+dosobj = src\dos\main.obj src\dos\gfx.obj src\dos\timer.obj &
+	src\dos\watdpmi.obj src\dos\vbe.obj src\dos\vga.obj src\dos\keyb.obj &
+	src\dos\mouse.obj src\dos\logger.obj
+scrobj = src\introscr.obj src\menuscr.obj
+gameobj = src\game.obj src\util.obj src\gfxutil.obj src\dynarr.obj &
+	src\rbtree.obj
+gfxobj = src\3dgfx\3dgfx.obj src\3dgfx\mesh.obj src\3dgfx\meshload.obj &
+	src\3dgfx\polyfill.obj src\3dgfx\polyclip.obj src\sprite.obj
 incpath = -Isrc -Isrc\dos -Ilibs\imago\src
 libpath = libpath libs\imago
 !endif
 
-obj = $(dosobj) $(gameobj)
+obj = $(dosobj) $(gameobj) $(gfxobj) $(scrobj)
 bin = game.exe
 
+def = -dM_PI=3.141592653589793
 libs = imago.lib
 
 CC = wcc386
 LD = wlink
-CFLAGS = -d3 -5 -fp5 -otebmileran -s -zq -bt=dos $(incpath)
+CFLAGS = -d3 -5 -fp5 -otebmileran $(def) -s -zq -bt=dos $(incpath)
 LDFLAGS = option map $(libpath) library { $(libs) }
 
-$(bin): $(obj)
+$(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
-.asm: src;src/dos
+.c: src;src/dos;src/3dgfx
+.asm: src;src/dos;src/3dgfx
+
+cflags.occ: Makefile
+	%write $@ $(CFLAGS)
 
 .c.obj: .autodepend
-	$(CC) -fo=$@ $(CFLAGS) $[*
+	$(CC) -fo=$@ @cflags.occ $[*
 
 .asm.obj:
 	nasm -f obj -o $@ $[*.asm
@@ -41,10 +53,12 @@ $(bin): $(obj)
 clean: .symbolic
 	rm -f $(obj)
 	rm -f $(bin)
+	rm -f cflags.occ *.lnk
 !else
 clean: .symbolic
 	del src\*.obj
 	del src\dos\*.obj
-	del objects.lnk
+	del *.lnk
+	del cflags.occ
 	del $(bin)
 !endif