OSDN Git Service

fixed some things cant compile png2vrl.c
[proj16/16.git] / makefile
index ea59bed..948387a 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -55,25 +55,25 @@ DOSLIBMAKEALL=./buildall.sh build all
 to_os_path=/=\
 REMOVECOMMAND=del
 COPYCOMMAND=copy /y
-MOVECOMMAND=move
+MOVECOMMAND=move /y
 DIRSEP=\
 OBJ=obj
 DUMP=type
-DOSLIBMAKE=.\make.bat
-DOSLIBMAKEALL=.\build.bat
+DOSLIBMAKE=make.bat build all
+DOSLIBMAKEALL=buildall.bat build all
 !endif
 
 TARGET_OS = dos
 MEMORYMODE = l
 
 BUILD_ROOT=$+$(%__CWD__)$-
-#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-DATADIR=data$(DIRSEP)
+#EXMMTESTDIR=16/exmmtest/
+DATADIR=data/
 SPRI=$(DATADIR)/spri
 SRC=src
-UTIL=$(SRC)/util
+UTIL=$(SRC)$(DIRSEP)util
 GITCONFIGDIR=$(UTIL)/git
-SCRIPTBATDIR=$(UTIL)/shbat
+SCRIPTBATDIR=$(UTIL)$(DIRSEP)shbat
 SRCLIB=$(SRC)/lib
 JSMNLIB=$(SRCLIB)/jsmn
 NYANLIB=$(SRCLIB)/nyan
@@ -83,11 +83,16 @@ MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
 DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
+OLDMODEX16LIBDIR=16$(DIRSEP)modex16
+#16/$(SRCLIB)
 
 DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
 DOSLIB_DOS=$(DOSLIBDIR)/hw/dos
 DOSLIB_VGA=$(DOSLIBDIR)/hw/vga
 DOSLIB_8250=$(DOSLIBDIR)/hw/8250
+DOSLIB_8254=$(DOSLIBDIR)/hw/8254
+DOSLIB_8259=$(DOSLIBDIR)/hw/8259
+DOSLIB_ADLIB=$(DOSLIBDIR)/hw/adlib
 DOSLIB_JOYSTICK=$(DOSLIBDIR)/hw/joystick
 DOSLIB_MEMMODE=dos86$(MEMORYMODE)
 
@@ -104,23 +109,28 @@ 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
+#STKSIZ=24576#40960
+
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k24576#32768
-Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k$(STKSIZ)
+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=$^&
-CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
+DBUGFLAGS=-fm=$^&.meh -fd=$^& $(D_FLAGS)
+CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 -DSTACKSIZE=$(STKSIZ)
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif
@@ -132,10 +142,10 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 # objects
 #
-VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-#OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
-GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
-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)
+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) 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)  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)
@@ -144,7 +154,7 @@ DOSLIBOBJ += 8250.$(OBJ)
 #
 # libraries
 #
-DOSLIBLIBS = $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib
+DOSLIBLIBS = $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib $(DOSLIB_8254)/$(DOSLIB_MEMMODE)/8254.lib $(DOSLIB_8259)/$(DOSLIB_MEMMODE)/8259.lib $(DOSLIB_ADLIB)/$(DOSLIB_MEMMODE)/adlib.lib
 !ifeq DEBUGSERIAL 1
 DOSLIBLIBS += $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib
 !endif
@@ -156,9 +166,9 @@ 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)
+.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)
 
 .$(OBJ) : .
 
@@ -183,19 +193,26 @@ LIBMAKERULE=*wlib $(LIBFLAGS) $(extra_$^&_lib_opts)$@ $<
 # List of executables to build
 #
 EXTERNTESTEXEC = &
-       joytest.exe &
        wcpu.exe &
        db.exe
 TESTEXEC = &
        vidtest.exe &
-       tesuto.exe &
-       0.exe &
+       paltest.exe &
        exmmtest.exe &
        vgmtest.exe &
-       zcroll.exe &
+       sountest.exe &
+       imfplay.exe &
+       xcroll.exe &
+       0croll.exe &
+       1croll.exe &
        inputest.exe &
        vrstest.exe &
-       maptest.exe
+       tesuto.exe &
+       0tesuto.exe &
+       maptest.exe &
+       vrldbg.exe
+#zcroll.exe &
+#sdtest.exe &  //disabled due to fuckery
 TESTEXEC2 = &
        pcxtest.exe &
        scroll.exe &
@@ -208,28 +225,42 @@ TESTEXEC3= &
        pcxtest2.exe
 UTILEXEC = &
        palettel.exe &
-       palllist.exe &
-       palettec.exe
+       palbomb.exe &
+       palettec.exe &
+       ps.exe
+#      fd-dbg.exe
 !ifdef __LINUX__
+DOSLIBTESTEXEC = &
+       joytest.exe &
+       opltest.exe
 SPRIUTILEXEC = &
        pcx2vrl &
        pcxsscut &
        vrl2vrs &
-       vrsdump
+       vrsdump &
+       vrldbg &
+       dro2imf &
+       dro2vgm &
+       imf2vgm &
+       raw2vgm
 #UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
 EXEC = &
        16.exe &
        bakapi.exe &
-       $(TESTEXEC)
+       $(TESTEXEC) &
+       $(UTILEXEC) &
+       $(DOSLIBTESTEXEC)
 
-#!ifdef __LINUX__
-#EXEC += $(SPRIUTILEXEC)
-#!endif
+!ifdef __LINUX__
+#++?EXEC += $(SPRIUTILEXEC)
+#EXEC += $(DOSLIBTESTEXEC)
+!endif
 
 ALLEXEC = &
        $(EXEC) &
+       sp2.exe &
        $(UTILEXEC) &
        $(TESTEXEC2) &
        $(TESTEXEC3)
@@ -241,76 +272,93 @@ testexec: $(EXEC) $(TESTEXEC2)
 # game and bakapi executables
 #
 16.exe:                16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-bakapi.exe:            bakapi.$(OBJ) gfx.lib $(DOSLIB)
+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!
 #
 scroll.exe:    scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ): $(SRC)/scroll.c
+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
 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)
+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)
+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)
 #vgacamm.exe:  vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palettec.exe:  palettec.$(OBJ) gfx.lib $(DOSLIB)
-palettel.exe:          palettel.$(OBJ) gfx.lib $(DOSLIB)
-palllist.exe:          palllist.$(OBJ) gfx.lib $(DOSLIB) ll.$(OBJ)
-pcxtest2.exe:   pcxtest2.$(OBJ) 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)
+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) $(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)
+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)
 
 #
 # executable's objects
 #
-16.$(OBJ):             $(SRC)/16.c $(SRC)/16.h
-bakapi.$(OBJ): $(SRC)/bakapi.c $(SRC)/bakapi.h
-vidtest.$(OBJ):        $(SRC)/vidtest.c $(SRCLIB)/16_vl.h
-#test2.$(OBJ): $(SRC)/test2.c $(SRCLIB)/16_vl.h
+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
-vrstest.$(OBJ):$(SRC)/vrstest.c $(SRCLIB)/16_vl.h
-#vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
-#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
-pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
+pcxtest.$(OBJ): $(SRC)/pcxtest.c       $(SRCLIB)/16_vl.h
+vrstest.$(OBJ): $(SRC)/vrstest.c       $(SRCLIB)/16_vl.h
+#vgacamm.$(OBJ): $(SRC)/vgacamm.c      $(SRCLIB)/16_vl.h
+#planrpcx.$(OBJ): $(SRC)/planrpcx.c    $(SRCLIB)/16_vl.h
+pcxtest2.$(OBJ): $(SRC)/pcxtest2.c     $(SRCLIB)/16_vl.h
 palettec.$(OBJ):       $(SRC)/palettec.c
 palettel.$(OBJ):       $(SRC)/palettel.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
-fmemtest.$(OBJ):$(SRC)/fmemtest.c
-fonttest.$(OBJ):$(SRC)/fonttest.c
+palbomb.$(OBJ):        $(SRC)/palbomb.c
+maptest.$(OBJ): $(SRC)/maptest.c       $(SRCLIB)/16_vl.h
+#emmtest.$(OBJ): $(SRC)/emmtest.c
+#emsdump.$(OBJ): $(SRC)/emsdump.c
+fmemtest.$(OBJ): $(SRC)/fmemtest.c
+fonttest.$(OBJ): $(SRC)/fonttest.c
 #fonttes0.$(OBJ): $(SRC)/fonttes0.c
-fontgfx.$(OBJ):$(SRC)/fontgfx.c
-inputest.$(OBJ):$(SRC)/inputest.c
-#inntest.$(OBJ):$(SRC)/inntest.c
-#sountest.$(OBJ): $(SRC)/sountest.c
+fontgfx.$(OBJ): $(SRC)/fontgfx.c
+inputest.$(OBJ): $(SRC)/inputest.c
+#inntest.$(OBJ): $(SRC)/inntest.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
-#testemm.$(OBJ):$(SRC)/testemm.c
+#testemm.$(OBJ): $(SRC)/testemm.c
 #testemm0.$(OBJ): $(SRC)/testemm0.c
 #tsthimem.$(OBJ): $(SRC)/tsthimem.c
-exmmtest.$(OBJ):$(SRC)/exmmtest.c
-vgmtest.$(OBJ):$(SRC)/vgmtest.c
+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
@@ -327,63 +375,125 @@ doslib.lib: $(DOSLIBLIBS)
 #
 # library deps 16-bit large
 $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib:
-       cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_CPU:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib:
-       cd $(DOSLIB_DOS:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_DOS:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vgatty.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_VGA)/$(DOSLIB_MEMMODE)/vga.lib:
-       cd $(DOSLIB_VGA:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_VGA:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib:
-       cd $(DOSLIB_8250:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
+       cd $(DOSLIB_8250:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+$(DOSLIB_8254)/$(DOSLIB_MEMMODE)/8254.lib:
+       cd $(DOSLIB_8254:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+$(DOSLIB_8259)/$(DOSLIB_MEMMODE)/8259.lib:
+       cd $(DOSLIB_8259:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+$(DOSLIB_ADLIB)/$(DOSLIB_MEMMODE)/adlib.lib:
+       cd $(DOSLIB_ADLIB:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
 
 joytest.exe:
-       cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
-       $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe
-
-16_vl.$(OBJ):  $(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h
-16_vlpal.$(OBJ):       $(SRCLIB)/16_vlpa_.c    $(SRCLIB)/16_vlpal.c $(SRCLIB)/16_vlpal.h
-bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
-16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h
-16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
-16_vrs.$(OBJ): $(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIB)
-16_spri.$(OBJ):$(SRCLIB)/16_spri.c $(SRCLIB)/16_spri.h
-bitmap.$(OBJ): $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
-planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h
-scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
-16text.$(OBJ): $(SRCLIB)/16text.c $(SRCLIB)/16text.h
-16_enti.$(OBJ):        $(SRCLIB)/16_enti.c $(SRCLIB)/16_enti.h
-mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
-16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
-16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
-16_in.$(OBJ):   $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
-#16_in_1.$(OBJ):        $(SRCLIB)/16_in_1.c $(SRCLIB)/16_in_1.h
-16_rf.$(OBJ):   $(SRCLIB)/16_rf.c      $(SRCLIB)/16_rf.h
-16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
-16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h
-16_ca.$(OBJ):   $(SRCLIB)/16_ca.c      $(SRCLIB)/16_ca.h
-16_us.$(OBJ):   $(SRCLIB)/16_us.c
-16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
-midi.$(OBJ):   $(SRCLIB)/midi.c $(SRCLIB)/midi.h
-16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.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
-jsmn.$(OBJ):   $(JSMNLIB)/jsmn.c $(JSMNLIB)/jsmn.h
-kitten.$(OBJ): $(NYANLIB)/kitten.c $(NYANLIB)/kitten.h
-vgmSnd.$(OBJ): $(VGMSNDLIB)/vgmSnd.c $(VGMSNDLIB)/vgmSnd.h
-16_wcpu.$(OBJ):        $(WCPULIB)/16_wcpu.c $(WCPULIB)/16_wcpu.h
-#memory.$(OBJ):$(EXMMLIB)/memory.c $(EXMMLIB)/memory.h
-c_utils.$(OBJ):$(MODEXLIB)/c_utils.asm
-modex.$(OBJ):   $(MODEXLIB)/modex.asm
-ll.$(OBJ):             $(SRCLIB)/ll.c  $(SRCLIB)/ll.h
+       cd $(DOSLIB_JOYSTICK:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+       $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe joytest.exe
+
+#imfplay.exe:
+#      cd $(DOSLIB_ADLIB:$(to_os_path))
+#      $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+#      cd $(BUILD_ROOT)
+#      $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/imfplay.exe imfplay.exe
+
+opltest.exe:
+       cd $(DOSLIB_ADLIB:$(to_os_path))
+       $(DOSLIBMAKE) $(DOSLIB_MEMMODE)
+       cd $(BUILD_ROOT)
+       $(COPYCOMMAND) $(DOSLIB_ADLIB:$(to_os_path))/$(DOSLIB_MEMMODE)/test.exe 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)
+16_spri.$(OBJ):        $(SRCLIB)/16_spri.c     $(SRCLIB)/16_spri.h
+planar.$(OBJ): $(SRCLIB)/planar.c      $(SRCLIB)/planar.h
+scroll16.$(OBJ):       $(SRCLIB)/scroll16.c    $(SRCLIB)/scroll16.h
+16text.$(OBJ): $(SRCLIB)/16text.c      $(SRCLIB)/16text.h
+16_enti.$(OBJ):        $(SRCLIB)/16_enti.c     $(SRCLIB)/16_enti.h
+mapread.$(OBJ):        $(SRCLIB)/mapread.c     $(SRCLIB)/mapread.h
+16_map.$(OBJ): $(SRCLIB)/16_map.c      $(SRCLIB)/16_map.h
+16_timer.$(OBJ):       $(SRCLIB)/16_timer.c    $(SRCLIB)/16_timer.h
+16_in.$(OBJ):  $(SRCLIB)/16_in.c       $(SRCLIB)/16_in.h
+16_mm.$(OBJ):  $(SRCLIB)/16_mm.c       $(SRCLIB)/16_mm.h
+16_pm.$(OBJ):  $(SRCLIB)/16_pm.c       $(SRCLIB)/16_pm.h
+16_ca.$(OBJ):  $(SRCLIB)/16_ca.c       $(SRCLIB)/16_ca.h
+16_rf.$(OBJ):  $(SRCLIB)/16_rf.c
+16_us.$(OBJ):  $(SRCLIB)/16_us.c
+16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c      $(SRCLIB)/16_dbg.h
+16_dbg_1.$(OBJ):       $(SRCLIB)/16_dbg_1.c    $(SRCLIB)/16_dbg.h
+16_head.$(OBJ):        $(SRCLIB)/16_head.c     $(SRCLIB)/16_head.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
+vgmSnd.$(OBJ): $(VGMSNDLIB)/vgmSnd.c   $(VGMSNDLIB)/vgmSnd.h
+16_wcpu.$(OBJ):        $(WCPULIB)/16_wcpu.c    $(WCPULIB)/16_wcpu.h
+#memory.$(OBJ):        $(EXMMLIB)/memory.c     $(EXMMLIB)/memory.h
+#midi.$(OBJ):  $(SRCLIB)/midi.c
+c_utils.$(OBJ):        $(MODEXLIB)/c_utils.asm
+modex.$(OBJ):  $(MODEXLIB)/modex.asm
+bitmapl.$(OBJ):        $(SRCLIB)/bitmapl.c     $(SRCLIB)/bitmapl.h
+
+#
+# old 16 lib
+#
+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)$(DIRSEP)0croll.c
+       wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(SRC)$(DIRSEP)0croll.c
+1croll.exe:    1croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# $(OLDLIBOBJS) omodex16.$(OBJ)# 16_ino.$(OBJ)
+       wcl -0 $(WCLQ) 1croll.$(OBJ) modex16.obj dos_kb.obj bitmap.obj# omodex16.$(OBJ) bitmap.$(OBJ)# 16_ino.$(OBJ)
+1croll.$(OBJ): $(SRC)$(DIRSEP)1croll.c
+       wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(SRC)$(DIRSEP)1croll.c
+#16render.$(OBJ):      $(OLDMODEX16LIBDIR)$(DIRSEP)16render.c  $(OLDMODEX16LIBDIR)$(DIRSEP)16render.h
+#      wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)16render.c
+bitmap.$(OBJ): $(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.c    $(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.h
+       wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)bitmap.c
+#omodex16.$(OBJ):      $(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.c  $(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.h
+#      wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)omodex16.c
+modex16.$(OBJ):        $(OLDMODEX16LIBDIR)$(DIRSEP)modex16.c   $(OLDMODEX16LIBDIR)$(DIRSEP)modex16.h
+       wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)modex16.c
+#16_ino.$(OBJ):        $(SRCLIB)$(DIRSEP)16_in.c       $(SRCLIB)$(DIRSEP)16_in.h
+#      wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=16_ino.$(OBJ) -c $(SRC)$(DIRSEP)lib$(DIRSEP)16_in.c
+dos_kb.$(OBJ): $(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.c    $(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.h
+       wcl -0 $(WCLQ) -i"$(DOSLIBDIR)" -fo=.$(OBJ) -c $(OLDMODEX16LIBDIR)$(DIRSEP)dos_kb.c
 
 #
 #other~
 #
 clean: .symbolic
-       @if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
-       @wmake -h initscript
+       @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
+       @wmake -s -h initscript
        @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @if exist *.LIB $(REMOVECOMMAND) *.LIB
@@ -391,7 +501,11 @@ clean: .symbolic
        @if exist *.EXE $(REMOVECOMMAND) *.EXE
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
        #@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
-       @if not exist vrl2vrs wmake -h pcx2vrl
+       @if not exist vrl2vrs wmake -s -h vrl2vrs
+       @if not exist pcx2vrl wmake -s -h pcx2vrl
+       #@if not exist png2vrl wmake -s -h png2vrl
+       @if not exist dro2imf wmake -s -h drotoimf
+       @if not exist raw2vgm wmake -s -h vgmtools
 !else
        @if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -420,6 +534,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
@@ -429,7 +544,7 @@ nuke: .symbolic
        @wmake comp
 
 backupconfig: .symbolic
-       @$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)/git_con.fig
+       @$(COPYCOMMAND) .git/config $(GITCONFIGDIR)/git_con.fig
        @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
        @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
@@ -440,41 +555,71 @@ initconfig: .symbolic
 
 
 backupscript: .symbolic
+       @$(COPYCOMMAND) WBUILD.BAT WBUILD.B
        @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
-       @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+       @$(MOVECOMMAND) WBUILD.B WBUILD.BAT
+
 !ifdef __LINUX__
+       @$(COPYCOMMAND) wbuild.sh wbuild.s
+       @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+       @$(MOVECOMMAND) wbuild.s wbuild.sh
+
        @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
-       @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+       @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh .
 !endif
-       @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
-       @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
+       @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh .
+       @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT .
 
 initscript: .symbolic
-       @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
-       @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+       @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.bat .
 !ifdef __LINUX__
-       @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+       @$(COPYCOMMAND) $(SCRIPTBATDIR)$(DIRSEP)*.sh .
+       @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT .
 !endif
 
 
 comp: .symbolic
-       @*upx -9 $(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 *.exe#$(EXEC)
+       @wmake -s -h e2exe
 
 comq: .symbolic
-       @*upx -9 $(UPXQ) $(EXEC)
+       @wmake -s -h exe2e
+       @*upx -9 $(UPXQ) *.exe#$(EXEC)
+       @wmake -s -h e2exe
+
+exe2e: .symbolic
+       @for %f in ($(ALLEXEC)) do @if exist %f $(MOVECOMMAND) %f $(SRCLIB)
+!ifdef __LINUX__
+       @if exist *.EXE ./make-lowercase *.EXE
+!endif
+       @if exist *.exe $(MOVECOMMAND) *.exe $(SRC)
+       @if exist $(SRCLIB)/*.exe $(MOVECOMMAND) $(SRCLIB)/*.exe .
+
+e2exe: .symbolic
+       @if exist $(SRC)/*.exe $(MOVECOMMAND) $(SRC)/*.exe .
 
 www: .symbolic
+       @if exist 16.exe @wmake -s -h wwwdo
+       @if exist 16.exe @wmake -s -h wwwext
+
+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
-       @wmake -h wwwext
 
 wwwext: .symbolic
-       @wmake -h wwwext1
-       @wmake -h wwwext2
+       @wmake -s -h wwwext2
+       #@wmake -s -h wwwext1
 
 wwwext1: .symbolic
        ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
@@ -517,6 +662,7 @@ cldl: .symbolic
 uplibs: .symbolic
        @cd $(JSMNLIB:$(to_os_path))
        @git pull
+       #@git checkout 18e9fe42cbfe21d65076f5c77ae2be379ad1270f
        @cd $(BUILD_ROOT)
        @cd $(DOSLIBDIR:$(to_os_path))
        @git pull
@@ -529,16 +675,21 @@ reinitlibs: .symbolic
        @$(REMOVECOMMAND) -rf 16/wolf3d
        @$(REMOVECOMMAND) -rf 16/keen
        @$(REMOVECOMMAND) -rf 16/Catacomb3D
-       @wmake -h initlibs
+       @$(REMOVECOMMAND) -rf 16/shitman
+       @$(REMOVECOMMAND) -rf 16/dro2imf
+       @$(REMOVECOMMAND) -rf 16/vgmtools
+       @wmake -s -h initlibs
 
 initlibs: .symbolic
-       @wmake -h initconfig
-       @wmake -h getlib
+       @wmake -s -h initconfig
+       @wmake -s -h getlib
        @cd 16
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
        @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 .
 
@@ -548,32 +699,57 @@ getlib: .symbolic
        @git clone https://github.com/zserge/jsmn.git
        @cd $(BUILD_ROOT)
 
+initshitman: .symbolic
+       @cd 16
+       @git clone https://github.com/joncampbell123/shitman.git
+       @cd shitman
+       @$(REMOVECOMMAND) -rf doslib
+       @git clone https://github.com/joncampbell123/doslib.git
+       @cd $(BUILD_ROOT)
+
 ##
 ##     experimental libs
 ##
 xlib: .symbolic
-       @cd 16$(DIRSEP)xlib
-       @wmake -h clean
-       @wmake -h all
+       @cd 16/xlib
+       @wmake -s -h clean
+       @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx: .symbolic
-       @cd 16$(DIRSEP)xw
+       @cd 16/xw
 #      @wmake clean
-       @wmake -h all
+       @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx_: .symbolic
-       @cd 16$(DIRSEP)xw_
-       @wmake -h -f makefile all
+       @cd 16/xw_
+       @wmake -s -h -f makefile all
        @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
-       @make all
-       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
+       ####@make all
+       @make pcx2vrl
+       @make vrl2vrs
+       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#/
        @cd $(BUILD_ROOT)
 !endif