X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=49420404ee74cdaf4981f338f9389827a22f161a;hb=9a536e7ada5a442984a3becef9e492b44eb5b101;hp=87b57f055923ea0d53951b43e62f373ada5bdc25;hpb=2256b96f617262bbae03353b94a8695931a5a225;p=16.git

diff --git a/makefile b/makefile
index 87b57f05..49420404 100755
--- a/makefile
+++ b/makefile
@@ -144,8 +144,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) scroll16.$(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)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_spri.$(OBJ) gamepal.$(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_snd.$(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)
@@ -202,6 +202,8 @@ TESTEXEC = &
 	exmmtest.exe &
 	vgmtest.exe &
 	sountest.exe &
+	imfplay.exe &
+	sdtest.exe &
 	xcroll.exe &
 	0croll.exe &
 	1croll.exe &
@@ -210,7 +212,6 @@ TESTEXEC = &
 	tesuto.exe &
 	0tesuto.exe &
 	maptest.exe &
-	imfplay.exe &
 	vrldbg.exe
 #zcroll.exe &
 TESTEXEC2 = &
@@ -225,10 +226,10 @@ TESTEXEC3= &
 	pcxtest2.exe
 UTILEXEC = &
 	palettel.exe &
-	palllist.exe &
 	palbomb.exe &
 	palettec.exe &
 	ps.exe
+#	fd-dbg.exe
 !ifdef __LINUX__
 SPRIUTILEXEC = &
 	pcx2vrl &
@@ -268,7 +269,7 @@ testexec: $(EXEC) $(TESTEXEC2)
 # game and bakapi executables
 #
 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
+bakapi.exe:		bakapi.$(OBJ) 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) $(DOSLIB) 16_wcpu.$(OBJ) gamepal.$(OBJ)# gfx.lib
 sp2.exe:		sp2.$(OBJ)
 
 #
@@ -294,6 +295,7 @@ fontgfx.exe:	fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 sountest.exe:	sountest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
 imfplay.exe:		imfplay.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
+sdtest.exe:	sdtest.$(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)
@@ -301,7 +303,6 @@ vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettec.exe:	palettec.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palettel.exe:	 	palettel.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 palbomb.exe: 	palbomb.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palllist.exe:	 	palllist.$(OBJ) $(16LIB) gfx.lib $(DOSLIB) ll.$(OBJ)
 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)
@@ -312,6 +313,7 @@ exmmtest.exe:	exmmtest.$(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)
+fd-dbg.exe:	fd-dbg.$(OBJ) 16_head.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
 wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 
 #
@@ -332,7 +334,6 @@ pcxtest2.$(OBJ):$(SRC)/pcxtest2.c	$(SRCLIB)/16_vl.h
 palettec.$(OBJ):	$(SRC)/palettec.c
 palettel.$(OBJ):	$(SRC)/palettel.c
 palbomb.$(OBJ):	$(SRC)/palbomb.c
-palllist.$(OBJ):	$(SRC)/palllist.c
 maptest.$(OBJ):$(SRC)/maptest.c	$(SRCLIB)/16_vl.h
 #emmtest.$(OBJ):$(SRC)/emmtest.c
 #emsdump.$(OBJ):$(SRC)/emsdump.c
@@ -342,7 +343,8 @@ fonttest.$(OBJ):$(SRC)/fonttest.c
 fontgfx.$(OBJ):$(SRC)/fontgfx.c
 inputest.$(OBJ):$(SRC)/inputest.c
 #inntest.$(OBJ):$(SRC)/inntest.c
-sountest.$(OBJ): $(SRC)/sountest.c
+sountest.$(OBJ):	$(SRC)/sountest.c
+sdtest.$(OBJ):	$(SRC)/sdtest.c
 imfplay.$(OBJ): $(SRC)/imfplay.c
 vrldbg.$(OBJ):	$(SRC)/vrldbg.c
 #miditest.$(OBJ): $(SRC)/miditest.c
@@ -353,6 +355,7 @@ exmmtest.$(OBJ):$(SRC)/exmmtest.c
 vgmtest.$(OBJ):$(SRC)/vgmtest.c
 db.$(OBJ):		$(UTIL)/db.c
 ps.$(OBJ):		$(SRC)/ps.c
+fd-dbg.$(OBJ):		$(SRC)/fd-dbg.c
 
 #
 # non executable objects libraries
@@ -400,6 +403,7 @@ opltest.exe:
 16_vl.$(OBJ):	$(SRCLIB)/16_vl.c	$(SRCLIB)/16_vl.h
 16_vl_1.$(OBJ):	$(SRCLIB)/16_vl_1.c	$(SRCLIB)/16_vl.h
 16_vlpal.$(OBJ):	$(SRCLIB)/16_vlpa_.c	$(SRCLIB)/16_vlpal.c	$(SRCLIB)/16_vlpal.h
+gamepal.$(OBJ):	$(SRCLIB)/gamepal.c
 bakapee.$(OBJ):	$(SRCLIB)/bakapee.c	$(SRCLIB)/bakapee.h
 16planar.$(OBJ):	$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
 #16_vrs.$(OBJ):	$(SRCLIB)/16_vrs.c	$(SRCLIB)/16_vrs.h $(DOSLIB)
@@ -423,6 +427,7 @@ mapread.$(OBJ):	$(SRCLIB)/mapread.c	$(SRCLIB)/mapread.h
 16_tail.$(OBJ):	$(SRCLIB)/16_tail.c	$(SRCLIB)/16_tail.h
 16_tail_.$(OBJ):	$(SRCLIB)/16_tail_.c	$(SRCLIB)/16_tail.h
 16_hc.$(OBJ):	$(SRCLIB)/16_hc.c	$(SRCLIB)/16_hc.h
+16_snd.$(OBJ):	$(SRCLIB)/16_snd.c	$(SRCLIB)/16_snd.h
 16_sd.$(OBJ):	$(SRCLIB)/16_sd.c	$(SRCLIB)/16_sd.h
 jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c	$(JSMNLIB)/jsmn.h
 kitten.$(OBJ):	$(NYANLIB)/kitten.c	$(NYANLIB)/kitten.h
@@ -432,7 +437,6 @@ vgmSnd.$(OBJ):	$(VGMSNDLIB)/vgmSnd.c	$(VGMSNDLIB)/vgmSnd.h
 #midi.$(OBJ):	$(SRCLIB)/midi.c
 c_utils.$(OBJ):	$(MODEXLIB)/c_utils.asm
 modex.$(OBJ):	$(MODEXLIB)/modex.asm
-ll.$(OBJ):		$(SRCLIB)/ll.c	$(SRCLIB)/ll.h
 bitmapl.$(OBJ):	$(SRCLIB)/bitmapl.c	$(SRCLIB)/bitmapl.h
 
 #
@@ -503,7 +507,7 @@ clean: .symbolic
 #	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
 #	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-	@if not exist ps.exe wmake -s -h ps.exe
+#	@if not exist ps.exe wmake -s -h ps.exe
 
 nuke: .symbolic
 	@wmake clean
@@ -555,10 +559,16 @@ www: .symbolic
 	@if exist 16.exe @wmake -s -h wwwdo
 	@if exist 16.exe @wmake -s -h wwwext
 
-wwwdo: .symbolic
+cleanwww:	.symbolic
+wwwclean:	.symbolic
+wwwcl:		.symbolic
+clwww:		.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*
+
+wwwdo: .symbolic
+	@wmake clwww
 	@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