xcroll fuckings please ignore and go to e9a094cdce9001737f17d3961f49f27272dff4e4

[16.git] / makefile

diff --git a/makefile b/makefile
index c0ed9da852d9506140a947ce61d7b2d24dd40cd9..bb06aa4230bc91c6fb22d59ac9f8a23be1e91856 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -34,7 +34,7 @@
 # comment this out on game release.
 # serial output goes to COM1 at 9600 baud 1 stop bit odd parity.
 # serial output is plain text ASCII.
-DEBUGSERIAL=0
+DEBUGSERIAL=1
 
 DELLOGFILE=1
 
@@ -139,10 +139,8 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBCOREOBJS = 16_vl.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) 16_vl_1.$(OBJ)        #bakapee.$(OBJ)
-GFXLIBOBJS = $(GFXLIBCOREOBJS) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ)
-16LIBCOREOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16_tail_.$(OBJ)
-16LIBOBJS = $(16LIBCOREOBJS) 16_sd.$(OBJ) 16_dbg_1.$(OBJ)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_sd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -262,8 +260,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
-#$(16LIB) gfx.lib
-xcroll.exe:    xcroll.$(OBJ) $(DOSLIB) $(16LIBCOREOBJS) $(GFXLIBCOREOBJS)
+xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 xcroll.$(OBJ): $(SRC)/xcroll.c
 zcroll.exe:    zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c
@@ -522,6 +519,9 @@ comq: .symbolic
        @*upx -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
+       @if exist 16.exe @wmake -s -h wwwdo
+
+wwwdo: .symbolic
        @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
        @$(REMOVECOMMAND) /var/www/*.exe.zi*
        @$(REMOVECOMMAND) /var/www/*.zip.zi*