X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=c8ed0d2670df6809ff535a677a8770548303e063;hb=a77883f4cefd1af3d71588871ef27e81a49194d8;hp=ece428f32399bf91d87b610a10e2155adfe11bc9;hpb=cfe889ac035848dbe4c3a89afb7c8c37a574163e;p=eradicate

diff --git a/Makefile b/Makefile
index ece428f..c8ed0d2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,32 +2,32 @@
 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
+gameobj = src/game.obj src/util.obj src/gfxutil.obj src/menuscr.obj
 incpath = -Isrc -Isrc/dos -Ilibs/imago/src
 libpath = libpath libs/imago
-RM = rm -f
 !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
+gameobj = src\game.obj src\util.obj src\gfxutil.obj src\menuscr.obj
 incpath = -Isrc -Isrc\dos -Ilibs\imago\src
 libpath = libpath libs\imago
-RM = del
 !endif
 
 obj = $(dosobj) $(gameobj)
 bin = game.exe
 
+libs = imago.lib
+
 CC = wcc386
 LD = wlink
 CFLAGS = -d3 -5 -fp5 -otebmileran -s -zq -bt=dos $(incpath)
-LDFLAGS = option map $(libpath)
-# library { $(libs) }
+LDFLAGS = option map $(libpath) library { $(libs) }
 
 $(bin): $(obj)
 	%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
@@ -38,8 +38,14 @@ $(bin): $(obj)
 .asm.obj:
 	nasm -f obj -o $@ $[*.asm
 
+!ifdef __UNIX__
 clean: .symbolic
-	$(RM) src\*.obj
-	$(RM) src\dos\*.obj
-	$(RM) objects.lnk
-	$(RM) $(bin)
+	rm -f $(obj)
+	rm -f $(bin)
+!else
+clean: .symbolic
+	del src\*.obj
+	del src\dos\*.obj
+	del *.lnk
+	del $(bin)
+!endif