chikyuu img added~

[16.git] / makefile

diff --git a/makefile b/makefile
index ac1cb527b909b0b5090c2bc6dd80195c9dd5e9e3..bc228a0a99ee342408f6f28d9172913ac9341869 100755 (executable)
--- 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 = &
@@ -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)
@@ -342,7 +344,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
@@ -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
@@ -464,7 +469,6 @@ dos_kb.$(OBJ):      $(OLDMODEX16LIBDIR)/dos_kb.c    $(OLDMODEX16LIBDIR)/dos_kb.h
 #
 clean: .symbolic
        @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
-       @if not exist ps.exe wmake -s -h ps.exe
        @wmake -s -h initscript
        @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
@@ -504,6 +508,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
 
 nuke: .symbolic
        @wmake clean
@@ -555,10 +560,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