X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=c70be703ed001536e573a38a26f930ad8976a3b8;hb=HEAD;hp=9cfb3abb138158d8b0167d9b54ab9921c59fec57;hpb=d24c217a0e44402bf3ea1b1392a5514cae4f0a25;p=dos_imgv

diff --git a/Makefile b/Makefile
index 9cfb3ab..c70be70 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,26 @@
-obj = main.obj video.obj vga.obj vbe.obj watdpmi.obj mouse.obj
+obj = main.obj video.obj vga.obj vbe.obj watdpmi.obj mouse.obj chkalloc.obj
 bin = imgv.exe
 
 #opt = -otexan
 warn = -w=3
 dbg = -d3
-def = -DNO_STDINT_H
+!ifdef __UNIX__
+inc = -Iimago/src
+libimago = imago/imago.lib
+!else
 inc = -Iimago\src
+libimago = imago\imago.lib
+!endif
 libdir = libpath imago
 
+#def = -DCHECK_ALLOC
+
 CC = wcc386
 LD = wlink
 CFLAGS = $(warn) $(dbg) $(opt) $(def) -zq -bt=dos $(inc)
 LDFLAGS = $(libdir) library { imago.lib }
 
-$(bin): $(obj)
+$(bin): $(obj) $(libimago)
 	%write objects.lnk $(obj)
 	%write ldflags.lnk $(LDFLAGS)
 	$(LD) debug all option map name $@ system dos4g file { @objects } @ldflags
@@ -27,8 +34,20 @@ $(bin): $(obj)
 .asm.obj:
 	nasm -f obj -o $@ $[*.asm
 
+$(libimago):
+	cd imago
+	wmake
+	cd ..
+
+!ifdef __UNIX__
+clean: .symbolic
+	rm -f $(obj)
+	rm -f objects.lnk ldflags.lnk
+	rm -f $(bin)
+!else
 clean: .symbolic
 	del *.obj
 	del objects.lnk
 	del ldflags.lnk
 	del $(bin)
+!endif