chikyuu img added~

[16.git] / makefile

diff --git a/makefile b/makefile
index e8313efe2b64416a9445cedae5b0114e7d994a15..bc228a0a99ee342408f6f28d9172913ac9341869 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -36,7 +36,7 @@
 # serial output is plain text ASCII.
 DEBUGSERIAL=1
 
-DELLOGFILE=0
+DELLOGFILE=1
 
 #192x144
 #wwww will add these
@@ -109,28 +109,27 @@ HOST2DIR=~/public_html/
 #ssh port
 HOST2PORT=22
 
-#
 # quiet flags
-#
 WLIBQ=-q
 WCLQ=-zq
 UPXQ=-qqq
 
-#
+# symbolic debug for wsample/wprof/wd
+D_FLAGS=-d1+
+
 # stacksize
-#
 STKSIZ=32768
-#24576#40960
+#STKSIZ=24576#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
+T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 $(D_FLAGS) -fo=.$(OBJ)## -e=65536
 
-DBUGFLAGS=-fm=$^&.meh -fd=$^&
+DBUGFLAGS=-fm=$^&.meh -fd=$^& $(D_FLAGS)
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=$(STKSIZ)
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
@@ -145,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)
@@ -167,7 +166,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,9 +198,12 @@ EXTERNTESTEXEC = &
        db.exe
 TESTEXEC = &
        vidtest.exe &
+       paltest.exe &
        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 = &
@@ -227,14 +228,19 @@ UTILEXEC = &
        palettel.exe &
        palllist.exe &
        palbomb.exe &
-       palettec.exe
+       palettec.exe &
+       ps.exe
 !ifdef __LINUX__
 SPRIUTILEXEC = &
        pcx2vrl &
        pcxsscut &
        vrl2vrs &
        vrsdump &
-       vrldbg
+       vrldbg &
+       dro2imf &
+       dro2vgm &
+       imf2vgm &
+       raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
@@ -251,6 +257,7 @@ EXEC = &
 
 ALLEXEC = &
        $(EXEC) &
+       sp2.exe &
        $(UTILEXEC) &
        $(TESTEXEC2) &
        $(TESTEXEC3)
@@ -262,7 +269,8 @@ 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)
 
 #
 # Test Executables!
@@ -278,15 +286,16 @@ 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
 #fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
 fontgfx.exe:   fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 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
+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)
@@ -295,12 +304,12 @@ 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)
+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)        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)
+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)
 
 vgmtest.exe:   vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
 db.exe:                db.$(OBJ)
@@ -312,7 +321,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
@@ -333,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
@@ -391,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)
@@ -414,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,6 +478,8 @@ clean: .symbolic
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
        #@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
        @if not exist vrl2vrs wmake -s -h pcx2vrl
+       @if not exist dro2imf wmake -s -h drotoimf
+       @if not exist raw2vgm wmake -s -h vgmtools
 !else
        @if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -492,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
@@ -512,8 +529,12 @@ initconfig: .symbolic
 
 
 backupscript: .symbolic
+       @$(COPYCOMMAND) WBUILD.BAT WBUILD.B
+       @$(COPYCOMMAND) wbuild.sh wbuild.s
        @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
        @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+       @$(MOVECOMMAND) WBUILD.B WBUILD.BAT
+       @$(MOVECOMMAND) wbuild.s wbuild.sh
 !ifdef __LINUX__
        @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
        @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
@@ -539,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
@@ -605,6 +632,8 @@ reinitlibs: .symbolic
        @$(REMOVECOMMAND) -rf 16/keen
        @$(REMOVECOMMAND) -rf 16/Catacomb3D
        @$(REMOVECOMMAND) -rf 16/shitman
+       @$(REMOVECOMMAND) -rf 16/dro2imf
+       @$(REMOVECOMMAND) -rf 16/vgmtools
        @wmake -s -h initlibs
 
 initlibs: .symbolic
@@ -615,6 +644,8 @@ 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
+       @git clone https://github.com/Malvineous/dro2imf.git
+       @git clone https://github.com/vgmrips/vgmtools.git
        @cd $(BUILD_ROOT)
        @$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
@@ -653,7 +684,22 @@ mx_: .symbolic
        @cd $(BUILD_ROOT)
 
 !ifdef __LINUX__
+drotoimf: .symbolic
+       @cd 16/dro2imf
+       @make
+       @$(MOVECOMMAND) dro2imf ../..
+       @cd $(BUILD_ROOT)
+
+vgmtools: .symbolic
+       @cd 16/vgmtools
+       @make
+       @$(MOVECOMMAND) dro2vgm ../..
+       @$(MOVECOMMAND) imf2vgm ../..
+       @$(MOVECOMMAND) raw2vgm ../..
+       @cd $(BUILD_ROOT)
+
 vrs: .symbolic
+vrl: .symbolic
 $(SPRIUTILEXEC):
        @cd $(DOSLIB_VGA:$(to_os_path))
        #@make clean