X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=f063595373d06345d2208c82c2821e785b831bc6;hb=e2dc030c9e52911ed9808a9e4a65bc9e0e9d8e9b;hp=1615fcde7b7f23e7ca58774935b3eab0d94acc10;hpb=447a16529ce4b0b576d89799f90bedc34c6eaf3b;p=16.git

diff --git a/makefile b/makefile
index 1615fcde..f0635953 100755
--- 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
 
@@ -116,16 +116,22 @@ WLIBQ=-q
 WCLQ=-zq
 UPXQ=-qqq
 
+#
+# stacksize
+#
+STKSIZ=32768
+#24576#40960
+
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k37000#32768#24576
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k$(STKSIZ)
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 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
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=STKSIZ
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif
@@ -139,10 +145,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) 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) 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 +266,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 +525,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*
@@ -531,8 +537,8 @@ www: .symbolic
 	@wmake -s -h wwwext
 
 wwwext: .symbolic
-	@wmake -s -h wwwext1
 	@wmake -s -h wwwext2
+	@wmake -s -h wwwext1
 
 wwwext1: .symbolic
 	####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
@@ -587,6 +593,7 @@ reinitlibs: .symbolic
 	@$(REMOVECOMMAND) -rf 16/wolf3d
 	@$(REMOVECOMMAND) -rf 16/keen
 	@$(REMOVECOMMAND) -rf 16/Catacomb3D
+	@$(REMOVECOMMAND) -rf 16/shitman
 	@wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -597,6 +604,7 @@ initlibs: .symbolic
 	@git clone https://github.com/id-Software/wolf3d.git
 	@git clone https://github.com/keendreams/keen.git
 	@git clone https://github.com/FlatRockSoft/Catacomb3D.git
+	@wmake initshitman
 	@cd $(BUILD_ROOT)
 	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -606,6 +614,14 @@ getlib: .symbolic
 	@git clone https://github.com/zserge/jsmn.git
 	@cd $(BUILD_ROOT)
 
+initshitman: .symbolic
+	@cd 16
+	@git clone https://github.com/joncampbell123/shitman.git
+	@cd shitman
+	@$(REMOVECOMMAND) -rf doslib
+	@git clone https://github.com/joncampbell123/doslib.git
+	@cd $(BUILD_ROOT)
+
 ##
 ##	experimental libs
 ##