projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
[dosdemo]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
3503834
..
e22c1fa
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,12
+1,13
@@
baseobj = main.obj
baseobj = main.obj
-demoobj = demo.obj screen.obj gfxutil.obj
-scrobj = tunnel.obj fract.obj grise.obj
+demoobj = demo.obj screen.obj gfxutil.obj 3dgfx.obj polyfill.obj
+scrobj = tunnel.obj fract.obj grise.obj polytest.obj
sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
sysobj = gfx.obj vbe.obj dpmi.obj timer.obj keyb.obj mouse.obj logger.obj
-obj = $(baseobj) $(demoobj) $(sysobj)
+obj = $(baseobj) $(demoobj) $(sysobj) $(scrobj)
bin = demo.exe
libs = imago.lib
bin = demo.exe
libs = imago.lib
+def = -dM_PI=3.141592653589793
opt = -5 -fp5 -otexan -oh -oi -ei
dbg = -d1
opt = -5 -fp5 -otexan -oh -oi -ei
dbg = -d1
@@
-22,12
+23,12
@@
AS = nasm
CC = wcc386
CXX = wpp386
ASFLAGS = -fobj
CC = wcc386
CXX = wpp386
ASFLAGS = -fobj
-CFLAGS = $(dbg) $(opt) -zq -bt=dos $(incpath)
+CFLAGS = $(dbg) $(opt) $(def) -zq -bt=dos $(incpath)
CXXFLAGS = $(CFLAGS)
LDFLAGS = libpath $(libpath) library { $(libs) }
LD = wlink
CXXFLAGS = $(CFLAGS)
LDFLAGS = libpath $(libpath) library { $(libs) }
LD = wlink
-$(bin): $(obj) libs/imago/imago.lib
+$(bin): cflags.occ $(obj) libs/imago/imago.lib
%write objects.lnk $(obj)
$(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
%write objects.lnk $(obj)
$(LD) debug all name $@ system dos4g file { @objects } $(LDFLAGS)
@@
-35,15
+36,23
@@
$(bin): $(obj) libs/imago/imago.lib
.cc: src;src/dos
.asm: src;src/dos
.cc: src;src/dos
.asm: src;src/dos
+cflags.occ: Makefile
+ %write $@ $(CFLAGS)
+
+cxxflags.occ: Makefile
+ %write $@ $(CXXFLAGS)
+
.c.obj: .autodepend
.c.obj: .autodepend
- $(CC) -fo=$@ $(CFLAGS) $[*
+ $(CC) -fo=$@ @cflags.occ $[*
.cc.obj: .autodepend
.cc.obj: .autodepend
- $(CXX) -fo=$@ $(CXXFLAGS) $[*
+ $(CXX) -fo=$@ @cxxflags.occ $[*
.asm.obj:
$(AS) $(ASFLAGS) -o $@ $[*.asm
clean: .symbolic
del *.obj
.asm.obj:
$(AS) $(ASFLAGS) -o $@ $[*.asm
clean: .symbolic
del *.obj
+ del *.occ
+ del *.lnk
del $(bin)
del $(bin)