X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=eradicate;a=blobdiff_plain;f=Makefile;fp=Makefile;h=b7ef6e3f19f133c8189e54f54c940b113440628e;hp=c8ed0d2670df6809ff535a677a8770548303e063;hb=879478749c2f426394d3d995ee6c079b3d9394e8;hpb=c667edc1da370d08d0af162adfdcb31ceae522ab

diff --git a/Makefile b/Makefile
index c8ed0d2..b7ef6e3 100644
--- a/Makefile
+++ b/Makefile
@@ -2,26 +2,33 @@
 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
+gameobj = src/game.obj src/util.obj src/gfxutil.obj src/dynarr.obj src/rbtree.obj &
+		src/menuscr.obj
+gfxobj = src/3dgfx/3dgfx.obj src/3dgfx/mesh.obj src/3dgfx/meshload.obj &
+		src/3dgfx/polyfill.obj src/3dgfx/polyclip.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
+gameobj = src\game.obj src\util.obj src\gfxutil.obj src\dynarr.obj src\rbtree.obj &
+		src\menuscr.obj
+gfxobj = src\3dgfx\3dgfx.obj src\3dgfx\mesh.obj src\3dgfx\meshload.obj &
+		src\3dgfx\polyfill.obj src\3dgfx\polyclip.obj
 incpath = -Isrc -Isrc\dos -Ilibs\imago\src
 libpath = libpath libs\imago
 !endif
 
-obj = $(dosobj) $(gameobj)
+obj = $(dosobj) $(gameobj) $(gfxobj)
 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)
@@ -29,8 +36,8 @@ $(bin): $(obj)
 	%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
 
 .c.obj: .autodepend
 	$(CC) -fo=$@ $(CFLAGS) $[*