projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
watcom build imago.lib
[dosdemo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
1044346
..
a78b496
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,23
+1,34
@@
baseobj = main.obj
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 tunnel.obj fract.obj gfxutil.obj
+sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
obj = $(baseobj) $(demoobj) $(sysobj)
bin = demo.exe
obj = $(baseobj) $(demoobj) $(sysobj)
bin = demo.exe
-opt = -5 -fp5 -otexan
+libs = imago.lib
+
+opt = -5 -fp5 -otexan -oh -oi -ei
dbg = -d1
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
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)
CXXFLAGS = $(CFLAGS)
+LDFLAGS = libpath $(libpath) library { $(libs) }
LD = wlink
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
.c: src;src/dos
.cc: src;src/dos