16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / makefile

diff --git a/makefile b/makefile
index bc868580868d010449b7ba70c9c05526bee69492..75c1241f4a15bdbca590f810cdabe95ee51487bd 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -131,7 +131,7 @@ O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536
 
 DBUGFLAGS=-fm=$^&.meh -fd=$^&
-CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=STKSIZ
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=$(STKSIZ)
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif
@@ -267,7 +267,7 @@ bakapi.exe:         bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(O
 #
 scroll.exe:    scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ): $(SRC)/scroll.c
-xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)                #bitmapl.$(OBJ)
+xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)                bitmapl.$(OBJ)
 xcroll.$(OBJ): $(SRC)/xcroll.c
 zcroll.exe:    zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c
@@ -296,8 +296,9 @@ pcxtest2.exe:        pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
 #planrpcx.exe: planrpcx.$(OBJ) gfx.lib
 maptest.exe:   maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 fmemtest.exe:   fmemtest.$(OBJ)
-exmmtest.exe:   exmmtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-#16_pm.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_mm.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ) 16_vl_1.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_dbg.$(OBJ)
+exmmtest.exe:   exmmtest.$(OBJ)        16_pm.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_mm.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ) 16_vl_1.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_dbg.$(OBJ)
+       #$(16LIB) gfx.lib $(DOSLIB)
+
 vgmtest.exe:   vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
 db.exe:                db.$(OBJ)
 ps.exe:                ps.$(OBJ) 16_head.$(OBJ)
@@ -532,6 +533,7 @@ comq: .symbolic
 
 www: .symbolic
        @if exist 16.exe @wmake -s -h wwwdo
+       @if exist 16.exe @wmake -s -h wwwext
 
 wwwdo: .symbolic
        @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
@@ -540,7 +542,6 @@ wwwdo: .symbolic
        @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
        @./src/util/z2.sh data.zip data
-       @wmake -s -h wwwext
 
 wwwext: .symbolic
        @wmake -s -h wwwext2