X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=253037a7a14f93363768b346f4fc28c2e03355ef;hb=1522130c288695fd2ad573be62b7bfc300eed6a3;hp=542a5db052b0c2741e4975215d4a607e1d6a4834;hpb=856e2f26da3f862e9db2ee66074e0c88554ac3d2;p=16.git

diff --git a/makefile b/makefile
index 542a5db0..253037a7 100755
--- a/makefile
+++ b/makefile
@@ -83,6 +83,8 @@ MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
 DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
+OLDMODEX16LIBDIR=16/modex16
+#16/$(SRCLIB)
 
 DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
 DOSLIB_DOS=$(DOSLIBDIR)/hw/dos
@@ -114,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 -k32768#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
@@ -137,8 +145,8 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(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)
+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)
@@ -199,7 +207,7 @@ TESTEXEC = &
 	inputest.exe &
 	vrstest.exe &
 	tesuto.exe &
-	0.exe &
+	0tesuto.exe &
 	maptest.exe &
 	imfplay.exe
 #zcroll.exe &
@@ -264,8 +272,8 @@ zcroll.exe:	zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ):	$(SRC)/zcroll.c
 tesuto.exe:	tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
 tesuto.$(OBJ):	$(SRC)/tesuto.c
-0.exe:			0.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-0.$(OBJ):		 $(SRC)/0.c
+0tesuto.exe:			0tesuto.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+0tesuto.$(OBJ):		 $(SRC)/0tesuto.c
 vidtest.exe:		 vidtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #test2.exe:	test2.$(OBJ) gfx.lib $(DOSLIB)
 test0.exe:		test0.$(OBJ)
@@ -414,18 +422,22 @@ ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 #
 # old 16 lib
 #
-0croll.exe:	0croll.$(OBJ) $(OLDLIBOBJS) omodex16.$(OBJ) 16_ino.$(OBJ)
-	wcl -0 $(WCLQ) 0croll.$(OBJ) omodex16.$(OBJ) bitmap.$(OBJ) 16_ino.$(OBJ)
+0croll.exe:	0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# $(OLDLIBOBJS) omodex16.$(OBJ)# 16_ino.$(OBJ)
+	wcl -0 $(WCLQ) 0croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# omodex16.$(OBJ) bitmap.$(OBJ)# 16_ino.$(OBJ)
 0croll.$(OBJ):	$(SRC)/0croll.c
 	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c src/0croll.c
-16render.$(OBJ):	16/$(SRCLIB)/16render.c	16/$(SRCLIB)/16render.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/16render.c
-bitmap.$(OBJ):	16/$(SRCLIB)/bitmap.c	16/$(SRCLIB)/bitmap.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/bitmap.c
-omodex16.$(OBJ):	16/$(SRCLIB)/omodex16.c	16/$(SRCLIB)/omodex16.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c 16/src/lib/omodex16.c
-16_ino.$(OBJ):	$(SRCLIB)/16_in.c	$(SRCLIB)/16_in.h
-	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
+#16render.$(OBJ):	$(OLDMODEX16LIBDIR)/16render.c	$(OLDMODEX16LIBDIR)/16render.h
+#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/16render.c
+bitmap.$(OBJ):	$(OLDMODEX16LIBDIR)/bitmap.c	$(OLDMODEX16LIBDIR)/bitmap.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/bitmap.c
+#omodex16.$(OBJ):	$(OLDMODEX16LIBDIR)/omodex16.c	$(OLDMODEX16LIBDIR)/omodex16.h
+#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/omodex16.c
+modex16.$(OBJ):	$(OLDMODEX16LIBDIR)/modex16.c	$(OLDMODEX16LIBDIR)/modex16.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/modex16.c
+#16_ino.$(OBJ):	$(SRCLIB)/16_in.c	$(SRCLIB)/16_in.h
+#	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=16_ino.$(OBJ) -c src/lib/16_in.c
+dos_kb.$(OBJ):	$(OLDMODEX16LIBDIR)/dos_kb.c	$(OLDMODEX16LIBDIR)/dos_kb.h
+	wcl -0 $(WCLQ) -i"src/lib/doslib" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)/dos_kb.c
 
 #
 #other~
@@ -513,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*
@@ -522,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*'