X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=Makefile;h=3503834de2a73e6ab26f83e603ebb96003814d12;hb=90a1ba8903eed9e3d4b17f4b56cd02ed801dd8b6;hp=10443469f26e4b486ca1ab6aa8bb1e9ff570beed;hpb=77c1d84c258ca14e1bba06ab711426668ff24290;p=dosdemo

diff --git a/Makefile b/Makefile
index 1044346..3503834 100644
--- a/Makefile
+++ b/Makefile
@@ -1,23 +1,35 @@
 baseobj = main.obj
-demoobj = demo.obj screen.obj tunnel.obj
-sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj logger.obj
+demoobj = demo.obj screen.obj gfxutil.obj
+scrobj = tunnel.obj fract.obj grise.obj
+sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
 obj = $(baseobj) $(demoobj) $(sysobj)
 bin = demo.exe
 
-opt = -5 -fp5 -otexan
+libs = imago.lib
+
+opt = -5 -fp5 -otexan -oh -oi -ei
 dbg = -d1
 
+!ifdef __UNIX__
+incpath = -Isrc -Isrc/dos -Ilibs/imago/src
+libpath = libs/imago
+!else
+incpath = -Isrc -Isrc\dos -Ilibs\imago\src
+libpath = libs\imago
+!endif
+
 AS = nasm
 CC = wcc386
 CXX = wpp386
 ASFLAGS = -fobj
-CFLAGS = $(dbg) $(opt) -zq -bt=dos -Isrc -Isrc\dos
+CFLAGS = $(dbg) $(opt) -zq -bt=dos $(incpath)
 CXXFLAGS = $(CFLAGS)
+LDFLAGS = libpath $(libpath) library { $(libs) }
 LD = wlink
 
-$(bin): $(obj)
-	%write objects.lnk system dos4g file { $(obj) }
-	$(LD) debug all name $@ @objects $(LDFLAGS)
+$(bin): $(obj) libs/imago/imago.lib
+	%write objects.lnk $(obj)
+	$(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
 
 .c: src;src/dos
 .cc: src;src/dos