X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=f837019e16c1752fa3b1f90954b499e4c8f9a83e;hb=18e7c24f9c024dedbc1854c5258530abf5ddd4be;hp=bc868580868d010449b7ba70c9c05526bee69492;hpb=8c5ce6d6e768ba3dfac7f4e2e95d68152ab42aaa;p=16.git

diff --git a/makefile b/makefile
index bc868580..f837019e 100755
--- a/makefile
+++ b/makefile
@@ -119,19 +119,19 @@ UPXQ=-qqq
 #
 # stacksize
 #
-STKSIZ=32768
-#24576#40960
+STKSIZ=24576
+#32768#40960
 
 #
 # compile flags
 #
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k$(STKSIZ)
-Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
+Z_FLAGS=-zk0 -zc#### -zp4 -ei#### -zm
 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
@@ -167,7 +167,7 @@ DOSLIB=doslib.lib
 #
 .c : $(SRC);$(SRCLIB);$(MODEXLIB16);$(JSMNLIB);$(NYANLIB);$(VGMSNDLIB);$(WCPULIB);$(UTIL)
 
-.asm : $(MODEXLIB);$(UTIL)
+.asm : $(MODEXLIB);$(UTIL);16/fcsp2src
 
 .lib : .;$(DOSLIB_CPU)/$(DOSLIB_MEMMODE);$(DOSLIB_DOS)/$(DOSLIB_MEMMODE);$(DOSLIB_VGA)/$(DOSLIB_MEMMODE);$(DOSLIB_8250)/$(DOSLIB_MEMMODE);$(DOSLIB_8254)/$(DOSLIB_MEMMODE);$(DOSLIB_ADLIB)/$(DOSLIB_MEMMODE)
 
@@ -199,6 +199,7 @@ EXTERNTESTEXEC = &
 	db.exe
 TESTEXEC = &
 	vidtest.exe &
+	paltest.exe &
 	exmmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
@@ -210,7 +211,8 @@ TESTEXEC = &
 	tesuto.exe &
 	0tesuto.exe &
 	maptest.exe &
-	imfplay.exe
+	imfplay.exe &
+	vrldbg.exe
 #zcroll.exe &
 TESTEXEC2 = &
 	pcxtest.exe &
@@ -232,7 +234,8 @@ SPRIUTILEXEC = &
 	pcx2vrl &
 	pcxsscut &
 	vrl2vrs &
-	vrsdump
+	vrsdump &
+	vrldbg
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -249,6 +252,7 @@ EXEC = &
 
 ALLEXEC = &
 	$(EXEC) &
+	sp2.exe &
 	$(UTILEXEC) &
 	$(TESTEXEC2) &
 	$(TESTEXEC3)
@@ -261,13 +265,14 @@ testexec: $(EXEC) $(TESTEXEC2)
 #
 16.exe:		16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 bakapi.exe:		bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ)# gfx.lib
+sp2.exe:		sp2.$(OBJ)
 
 #
 # Test Executables!
 #
 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
@@ -276,6 +281,7 @@ tesuto.$(OBJ):	$(SRC)/tesuto.c
 0tesuto.exe:			0tesuto.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 0tesuto.$(OBJ):		 $(SRC)/0tesuto.c
 vidtest.exe:		 vidtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+paltest.exe:		 paltest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #test2.exe:	test2.$(OBJ) gfx.lib $(DOSLIB)
 test0.exe:		test0.$(OBJ)
 fonttest.exe:	 fonttest.$(OBJ) gfx.lib
@@ -285,6 +291,7 @@ inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 #inntest.exe:	 	inntest.$(OBJ)	$(16LIBNOINOBJS) 16_in_1.$(OBJ) $(DOSLIB) gfx.lib
 sountest.exe:	sountest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 imfplay.exe:		imfplay.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
+vrldbg.exe:		vrldbg.$(OBJ) #gfx.lib $(DOSLIB)
 pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #vgacamm.exe:	vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -296,8 +303,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)
@@ -308,7 +316,9 @@ wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 #
 16.$(OBJ):		$(SRC)/16.c	$(SRC)/16.h
 bakapi.$(OBJ):	$(SRC)/bakapi.c	$(SRC)/bakapi.h
+sp2.$(OBJ):		16/fcsp2src/sp2.asm
 vidtest.$(OBJ):	$(SRC)/vidtest.c	$(SRCLIB)/16_vl.h
+psltest.$(OBJ):	$(SRC)/paltest.c	$(SRCLIB)/16_vl.h
 #test2.$(OBJ):	$(SRC)/test2.c	$(SRCLIB)/16_vl.h
 test0.$(OBJ):	 $(SRC)/test0.c
 pcxtest.$(OBJ):$(SRC)/pcxtest.c	$(SRCLIB)/16_vl.h
@@ -331,6 +341,7 @@ inputest.$(OBJ):$(SRC)/inputest.c
 #inntest.$(OBJ):$(SRC)/inntest.c
 sountest.$(OBJ): $(SRC)/sountest.c
 imfplay.$(OBJ): $(SRC)/imfplay.c
+vrldbg.$(OBJ):	$(SRC)/vrldbg.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
 #testemm0.$(OBJ): $(SRC)/testemm0.c
@@ -532,6 +543,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 +552,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
@@ -649,6 +660,7 @@ mx_: .symbolic
 
 !ifdef __LINUX__
 vrs: .symbolic
+vrl: .symbolic
 $(SPRIUTILEXEC):
 	@cd $(DOSLIB_VGA:$(to_os_path))
 	#@make clean