From: sparky4 <sparky4@cock.li>
Date: Sun, 28 Aug 2016 00:16:44 +0000 (-0500)
Subject: new makefile~
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=bbca62cf0e7937a5dc92a46968a7ab6c193ac5f5;p=16.git

new makefile~
---

diff --git a/WBUILD.BAT b/WBUILD.BAT
index 2cffdc10..4a61ec18 100755
--- a/WBUILD.BAT
+++ b/WBUILD.BAT
@@ -1,6 +1,6 @@
 @echo off
-wmake -h clean -f makefile.wat
-wmake -h -f makefile.wat
+wmake -h clean
+wmake -h
 rem wmake -h comp
 if exist *.err (wmake vomitchan)
 rem if exist *.o (del *.o)
diff --git a/_wlib284.$$$ b/_wlib284.$$$
new file mode 100755
index 00000000..0da3d638
Binary files /dev/null and b/_wlib284.$$$ differ
diff --git a/_wlib411.$$$ b/_wlib411.$$$
deleted file mode 100755
index fcc6b21b..00000000
Binary files a/_wlib411.$$$ and /dev/null differ
diff --git a/makefile b/makefile
index 4782eb61..9b030da4 100755
--- a/makefile
+++ b/makefile
@@ -44,31 +44,35 @@ OBJ=obj
 DUMP=cat
 !else		#DOS ^^
 to_os_path=/=\
-REMOVECOMMAND=*del
-COPYCOMMAND=*copy /y
+REMOVECOMMAND=del
+COPYCOMMAND=copy /y
 DIRSEP=\
 OBJ=obj
-DUMP=*type
+DUMP=type
 !endif
 
 TARGET_OS = dos
 
 BUILD_ROOT=$+$(%__CWD__)$-
 #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-PDIR=..$(DIRSEP)
-SRC=src$(DIRSEP)
 DATADIR=data$(DIRSEP)
 SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
-SRCLIB=$(SRC)lib$(DIRSEP)
-JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
-NYANLIB=$(SRCLIB)nyan$(DIRSEP)
-#EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
-MODEXLIB=$(SRCLIB)modex16$(DIRSEP)
-MODEXLIB_=$(SRCLIB)modex$(DIRSEP)
-VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP)
-DOSLIB=$(SRCLIB)doslib$(DIRSEP)
-DOSLIBDIR=$(SRCLIB)doslib
-WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
+SRC=src
+SRCLIB=src/lib
+JSMNLIB=src/lib/jsmn
+NYANLIB=src/lib/nyan
+EXMMLIB=src/lib/exmm
+MODEXLIB16=src/lib/modex16
+MODEXLIB=src/lib/modex
+VGMSNDLIB=src/lib/vgmsnd
+DOSLIB=src/lib/doslib
+WCPULIB=src/lib/wcpu
+
+DOSLIB_CPU=src/lib/doslib/hw/cpu
+DOSLIB_DOS=src/lib/doslib/hw/dos
+DOSLIB_VGA=src/lib/doslib/hw/vga
+DOSLIB_8250=src/lib/doslib/hw/8250
+DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick
 
 #
 # quiet flags
@@ -80,292 +84,219 @@ UPXQ=-qqq
 #
 # compile flags
 #
-AFLAGS=-mh -0 -d1
-SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
-DFLAGS=-bt=dos -DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
-ZFLAGS=-zk0 -zc -zp8 -zm $(WCLQ)
-LFLAGS=-lr -l=dos
-CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAGS) -fo=.$(OBJ)
-OFLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok##x
-FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
+Z_FLAGS=-zk0 -zc -zp8 -zm
+O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
+T_FLAGS=-bt=dos -mh -0 -fpi87
+
+CPPFLAGS=-DTARGET_MSDOS=16
+!ifeq DEBUGSERIAL 1
+CPPFLAGS += -DDEBUGSERIAL
+!endif
+AFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ)
+CFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
+LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah
+LIBFLAGS=$(WLIBQ) -b -n
 
 #
 # objects
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) $(DOSLIBLIBS) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
-#planar.$(OBJ) 16planar.$(OBJ)
-DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib
-
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
+#16planar.$(OBJ) planar.$(OBJ)
+DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
-FLAGS += -DDEBUGSERIAL
 DOSLIBOBJ += 8250.$(OBJ)
-DOSLIBLIBS += $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib
-!endif
-
-TESTEXEC = test.exe test0.exe pcxtest.exe pcxtest2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe exmmtest.exe vrstest.exe
-##planrpcx.exe test2.exe
-EXEC = 16.exe bakapi.exe tesuto.exe 0.exe $(TESTEXEC)
-
-all: $(EXEC) joytest.exe
-#16.lib => $(16LIBOBJS) bug....
-16LIB=$(16LIBOBJS)
-#16LIB=16.lib
-
-!ifeq DEBUGSERIAL 1
-16LIBOBJS += $(DOSLIBLIBS)
 !endif
 
 #
-#game and bakapi executables
+# libraries
 #
-16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
-	*wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=16.mah
-
-bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
-	*wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.mah
+DOSLIBLIBS = $(DOSLIB_CPU)/dos86h/cpu.lib $(DOSLIB_DOS)/dos86h/dos.lib $(DOSLIB_VGA)/dos86h/vga.lib
+!ifeq DEBUGSERIAL 1
+DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
+!endif
+16LIB=16.lib
 
 #
-#Test Executables!
+#	Files locations
 #
-scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
-	*wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=scroll.mah
-scroll.$(OBJ): $(SRC)scroll.c
-	*wcl $(FLAGS) -c $(SRC)scroll.c
-
-tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
-	*wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
-tesuto.$(OBJ): $(SRC)tesuto.c
-	*wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+.c : $(SRC);$(SRCLIB);$(MODEXLIB16);$(JSMNLIB);$(NYANLIB);$(VGMSNDLIB);$(WCPULIB)
 
-0.exe: 0.$(OBJ) $(DOSLIBLIBS) gfx.lib $(16LIB)
-	*wcl $(FLAGS) $(WCLQ) 0.$(OBJ) $(DOSLIBLIBS) gfx.lib $(16LIB)
-0.$(OBJ): $(SRC)0.c
-	*wcl $(FLAGS) $(WCLQ) -c $(SRC)0.c
+.asm : $(MODEXLIB)
 
-test.exe: test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB)
-	*wcl $(FLAGS) test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB) -fm=test.mah
+.lib : .;$(DOSLIB_CPU)/dos86h;$(DOSLIB_DOS)/dos86h;$(DOSLIB_VGA)/dos86h;$(DOSLIB_8250)/dos86h
 
-#test2.exe: test2.$(OBJ) $(DOSLIBLIBS) gfx.lib
-#	*wcl $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah
+.obj : .
 
-test0.exe: test0.$(OBJ)
-	*wcl $(FLAGS) test0.$(OBJ) -fm=test0.mah
-
-fonttest.exe: fonttest.$(OBJ) $(16LIB) gfx.lib
-	*wcl $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah
-
-#fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
-#	*wcl $(FLAGS) fonttes0.$(OBJ) $(16LIB)
-
-fontgfx.exe: fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-	*wcl $(FLAGS) fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah
-
-inputest.exe: inputest.$(OBJ) $(16LIB)
-	*wcl $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah
-
-#sountest.exe: sountest.$(OBJ) $(16LIB)
-#	*wcl $(FLAGS) sountest.$(OBJ) $(16LIB)
-
-pcxtest.exe: pcxtest.$(OBJ) gfx.lib
-	*wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah
-
-vrstest.exe: vrstest.$(OBJ) gfx.lib $(16LIB)
-	*wcl $(FLAGS) vrstest.$(OBJ) gfx.lib $(16LIB) -fm=vrstest.mah
-
-palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIB)
-	*wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIB)
-
-palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIB)
-	*wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIB)
+#
+#	Default make rules
+#
+.c.obj:
+	*wcl $(CPPFLAGS) $(CFLAGS) $(extra_$^&_obj_opts) -c $[@
 
-pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
-	*wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah
+.asm.obj:
+	*wcl $(AFLAGS) $(extra_$^&_obj_opts) -c $[@
 
-##planrpcx.exe: planrpcx.$(OBJ) gfx.lib
-##	*wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah
+.obj.exe :
+	*wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
 
-maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib
-	*wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=maptest.mah
+.obj.lib :
+	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
 
-fmemtest.exe: fmemtest.$(OBJ) $(16LIB)
-	*wcl $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah
+#
+# List of executables to build
+#
+TESTEXEC = &
+    test.exe &
+    test0.exe &
+    pcxtest.exe &
+    pcxtest2.exe &
+    palettec.exe &
+    maptest.exe &
+    fmemtest.exe &
+    fonttest.exe &
+    fontgfx.exe &
+    scroll.exe &
+    vgmtest.exe &
+    inputest.exe &
+    palettel.exe &
+    exmmtest.exe &
+    vrstest.exe
+EXEC = &
+    16.exe &
+    bakapi.exe &
+    tesuto.exe &
+    0.exe &
+    $(TESTEXEC)
 
-exmmtest.exe: exmmtest.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
-	*wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB)
+all: $(EXEC) joytest.exe
 
-vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
-	*wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIB)
+#
+# game and bakapi executables
+#
+16.exe:           16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+bakapi.exe:       bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
 
+#
+# Test Executables!
+#
+scroll.exe:       scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+scroll.$(OBJ):    $(SRC)/scroll.c
+tesuto.exe:       tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
+tesuto.$(OBJ):    $(SRC)/tesuto.c
+0.exe:            0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+0.$(OBJ):         $(SRC)/0.c
+test.exe:         test.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+#test2.exe:       test2.$(OBJ) gfx.lib $(DOSLIBLIBS)
+test0.exe:        test0.$(OBJ)
+fonttest.exe:     fonttest.$(OBJ) gfx.lib
+#fonttes0.exe:    fonttes0.$(OBJ) $(16LIB)
+fontgfx.exe:      fontgfx.$(OBJ) gfx.lib $(DOSLIBLIBS)
+inputest.exe:     inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
+#sountest.exe:    sountest.$(OBJ) $(16LIB)
+pcxtest.exe:      pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS)
+vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
+palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
+pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
+#planrpcx.exe:    planrpcx.$(OBJ) gfx.lib
+maptest.exe:      maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
+fmemtest.exe:     fmemtest.$(OBJ)
+exmmtest.exe:     exmmtest.$(OBJ) $(16LIB)
+vgmtest.exe:      vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
 
 #
-#executable's objects
+# executable's objects
 #
-{$(SRC)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-
-16.$(OBJ): $(SRC)16.h $(SRC)16.c .symbolic
-bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c .symbolic
-test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h .symbolic
-#test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h .symbolic
-test0.$(OBJ): $(SRC)test0.c .symbolic
-pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h .symbolic
-vrstest.$(OBJ): $(SRC)vrstest.c $(SRCLIB)modex16.h .symbolic
-##planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h .symbolic
-pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h .symbolic
-palettec.$(OBJ): $(SRC)palettec.c .symbolic
-palettel.$(OBJ): $(SRC)palettel.c .symbolic
-maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h .symbolic
-#emmtest.$(OBJ): $(SRC)emmtest.c .symbolic
-#emsdump.$(OBJ): $(SRC)emsdump.c .symbolic
-fmemtest.$(OBJ): $(SRC)fmemtest.c .symbolic
-fonttest.$(OBJ): $(SRC)fonttest.c .symbolic
-#fonttes0.$(OBJ): $(SRC)fonttes0.c .symbolic
-fontgfx.$(OBJ): $(SRC)fontgfx.c .symbolic
-inputest.$(OBJ): $(SRC)inputest.c .symbolic
-#sountest.$(OBJ): $(SRC)sountest.c .symbolic
-#miditest.$(OBJ): $(SRC)miditest.c .symbolic
-#testemm.$(OBJ): $(SRC)testemm.c .symbolic
-#testemm0.$(OBJ): $(SRC)testemm0.c .symbolic
-#tsthimem.$(OBJ): $(SRC)tsthimem.c .symbolic
-exmmtest.$(OBJ): $(SRC)exmmtest.c .symbolic
-####	*wcl $(FLAGS) -c $(SRC)exmmtest.c 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ)
-vgmtest.$(OBJ): $(SRC)vgmtest.c .symbolic
+16.$(OBJ):        $(SRC)/16.c $(SRC)/16.h
+bakapi.$(OBJ):    $(SRC)/bakapi.c $(SRC)/bakapi.h
+test.$(OBJ):      $(SRC)/test.c $(SRCLIB)/modex16.h
+#test2.$(OBJ):    $(SRC)/test2.c $(SRCLIB)/modex16.h
+test0.$(OBJ):     $(SRC)/test0.c
+pcxtest.$(OBJ):   $(SRC)/pcxtest.c $(SRCLIB)/modex16.h
+vrstest.$(OBJ):   $(SRC)/vrstest.c $(SRCLIB)/modex16.h
+#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h
+pcxtest2.$(OBJ):  $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h
+palettec.$(OBJ):  $(SRC)/palettec.c
+palettel.$(OBJ):  $(SRC)/palettel.c
+maptest.$(OBJ):   $(SRC)/maptest.c $(SRCLIB)/modex16.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
+#sountest.$(OBJ): $(SRC)/sountest.c
+#miditest.$(OBJ): $(SRC)/miditest.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
 
 #
-#non executable objects libraries
+# non executable objects libraries
 #
-#.C.LIB:
-#	*wlib -b $(WLIBQ) $[@
 
-16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
-	*wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
+16.lib: $(16LIBOBJS)
+vgmsnd.lib: $(VGMSNDOBJ)
 
 gfx.lib: $(GFXLIBOBJS)
-	*wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
-
-vgmsnd.lib: $(VGMSNDOBJ)
-	*wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
+	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
 
 # extdep:
 # !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
 
 # library deps 16-bit huge
-$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu && .$(DIRSEP)make.sh
-	cd $(BUILD_ROOT)
-$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh
-	cd $(BUILD_ROOT)
-$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
-	cd $(BUILD_ROOT)
-$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
-	cd $(BUILD_ROOT)
-$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250 && .$(DIRSEP)make.sh
-	cd $(BUILD_ROOT)
+$(DOSLIB_CPU)/dos86h/cpu.lib:
+	cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+$(DOSLIB_DOS)/dos86h/dos.lib:
+	cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+$(DOSLIB_VGA)/dos86h/vgatty.lib:
+	cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+$(DOSLIB_VGA)/dos86h/vga.lib:
+	cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+$(DOSLIB_8250)/dos86h/8250.lib:
+	cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
 
 joytest.exe:
-	cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(BUILD_ROOT)$(DIRSEP)joytest.exe
-	cd $(BUILD_ROOT)
+	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
+	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
 #$(DOSLIBLIBS): .symbolic
-#	@cd $(DOSLIB)
+#	@cd $(DOSLIB:$(to_os_path))
 #	@.$(DIRSEP)buildall.sh
 #	@cd $(BUILD_ROOT)
 
-{$(SRCLIB)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-
-modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)modex16.c
-
-bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)bakapee.c
-
-16render.$(OBJ): $(SRCLIB)16render.h $(SRCLIB)16render.c .symbolic
-	#*wcl $(FLAGS) -c $(MODEXLIB)16render.c
-
-##16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
-##	*wcl $(FLAGS) -c $(MODEXLIB)16planar.c
-
-16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS) .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
-16_sprit.$(OBJ): $(SRCLIB)16_sprit.h $(SRCLIB)16_sprit.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_sprit.c
-
-
-bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)bitmap.c
-
-##planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
-##	*wcl $(FLAGS) -c $(SRCLIB)planar.c
-
-scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)scroll16.c
-
-16text.$(OBJ): $(SRCLIB)16text.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16text.c
-
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)mapread.c
-
-16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_timer.c
-
-16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_in.c
-
-16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_mm.c
-
-16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_ca.c
-
-16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
-
-midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)midi.c
-
-16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_head.c
-
-16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_hc.c
-
-16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c .symbolic
-	#*wcl $(FLAGS) -c $(SRCLIB)16_snd.c
-
-
-{$(JSMNLIB)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-{$(NYANLIB)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-{$(VGMSNDLIB)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-{$(WCPULIB)}.C.$(OBJ):
-	*wcl $(FLAGS) -c $[@
-
-jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c .symbolic
-	#*wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
-kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c .symbolic
-	#*wcl $(FLAGS) -c $(NYANLIB)kitten.c
-vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c .symbolic
-	#*wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
-wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c .symbolic
-	#*wcl $(FLAGS) -c $(WCPULIB)wcpu.c
-
-#memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
-#	*wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
-
-c_utils.$(OBJ): $(MODEXLIB_)c_utils.asm
-	*wcl -c $(AFLAGS) $(MODEXLIB_)c_utils.asm
-modex.$(OBJ): $(MODEXLIB_)modex.asm
-	*wcl -c $(AFLAGS) $(MODEXLIB_)modex.asm
+modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.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 $(DOSLIBLIBS)
+16_sprit.$(OBJ):  $(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.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
+mapread.$(OBJ):   $(SRCLIB)/mapread.c $(SRCLIB)/mapread.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_ca.$(OBJ):     $(SRCLIB)/16_ca.c $(SRCLIB)/16_ca.h
+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_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
+wcpu.$(OBJ):      $(WCPULIB)/wcpu.c $(WCPULIB)/wcpu.h
+#memory.$(OBJ):   $(EXMMLIB)/memory.c $(EXMMLIB)/memory.h
+c_utils.$(OBJ):   $(MODEXLIB)/c_utils.asm
+modex.$(OBJ):     $(MODEXLIB)/modex.asm
 
 #
 #other~
@@ -397,7 +328,7 @@ clean: .symbolic
 	@$(REMOVECOMMAND) *.mah
 	@$(REMOVECOMMAND) *.err
 	@echo $(OBJ)
-	#@cd $(DOSLIB)
+	#@cd $(DOSLIB:$(to_os_path))
 	#@./buildall.sh clean
 	#@cd $(BUILD_ROOT)
 #	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
@@ -442,15 +373,15 @@ vomitchan: .symbolic
 ##
 #git submodule add <repo>
 mkdl: .symbolic
-	@cd $(DOSLIB)
+	@cd $(DOSLIB:$(to_os_path))
 	@./buildall.sh
 	@cd $(BUILD_ROOT)
 
 uplibs: .symbolic
-	@cd $(JSMNLIB)
+	@cd $(JSMNLIB:$(to_os_path))
 	@git pull
 	@cd $(BUILD_ROOT)
-	@cd $(DOSLIB)
+	@cd $(DOSLIB:$(to_os_path))
 	@git pull
 	@cd $(BUILD_ROOT)
 
@@ -466,7 +397,7 @@ initlibs: .symbolic
 	@cp git_con.fig .git/config
 	@cp git_modu.les .gitmodules
 	@cp git_igno.re .gitignore
-	@cd $(SRCLIB)
+	@cd $(SRCLIB:$(to_os_path))
 	@git clone https://github.com/joncampbell123/doslib.git
 	@git clone https://github.com/zserge/jsmn.git
 	@cd $(BUILD_ROOT)
@@ -475,7 +406,7 @@ initlibs: .symbolic
 	@git clone https://github.com/id-Software/wolf3d.git
 	@git clone https://github.com/keendreams/keen.git
 	@cd $(BUILD_ROOT)
-	@cp $(SRCLIB)doslib/make-lowercase .
+	@cp $(DOSLIB)/make-lowercase .
 
 ##
 ##	experimental libs
@@ -498,7 +429,7 @@ mx_: .symbolic
 	@cd $(BUILD_ROOT)
 
 vrs: .symbolic
-	@cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga
+	@cd $(DOSLIB_VGA:$(to_os_path))
 	#@make clean
 	@make all
 	@mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
diff --git a/makefile.wat b/makefile.wat
deleted file mode 100755
index 9b030da4..00000000
--- a/makefile.wat
+++ /dev/null
@@ -1,439 +0,0 @@
-#
-#	Higanbana Project makefile
-#
-#
-# Possible optimizations for 8088 class processors
-#
-# -oa   Relax alias checking
-# -ob   Try to generate straight line code
-# -oe - expand user functions inline (-oe=20 is default, adds lots of code)
-# -oh   Enable repeated optimizations
-# -oi   generate certain lib funcs inline
-# -oi+  Set max inline depth (C++ only, use -oi for C)
-# -ok   Flowing of register save into function flow graph
-# -ol   loop optimizations
-# -ol+  loop optimizations plus unrolling
-# -or   Reorder for pipelined (486+ procs); not sure if good to use
-# -os   Favor space over time
-# -ot   Favor time over space
-# -ei   Allocate an "int" for all enum types
-# -zp2  Allow compiler to add padding to structs
-# -zpw  Use with above; make sure you are warning free!
-# -0    8088/8086 class code generation
-# -s    disable stack overflow checking
-
-# -zk0u	translate kanji to unicode... wwww
-# -zk0	kanji support~
-# -zkl		current codepage
-
-# this enables debug output to the serial port.
-# comment this out on game release.
-# serial output goes to COM1 at 9600 baud 1 stop bit odd parity.
-# serial output is plain text ASCII.
-DEBUGSERIAL=1
-
-#192x144
-#wwww will add these
-!ifdef __LINUX__
-#!ifdef UNIX
-to_os_path=\=/
-REMOVECOMMAND=rm -f
-COPYCOMMAND=cp -f
-DIRSEP=/
-OBJ=obj
-DUMP=cat
-!else		#DOS ^^
-to_os_path=/=\
-REMOVECOMMAND=del
-COPYCOMMAND=copy /y
-DIRSEP=\
-OBJ=obj
-DUMP=type
-!endif
-
-TARGET_OS = dos
-
-BUILD_ROOT=$+$(%__CWD__)$-
-#EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
-DATADIR=data$(DIRSEP)
-SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
-SRC=src
-SRCLIB=src/lib
-JSMNLIB=src/lib/jsmn
-NYANLIB=src/lib/nyan
-EXMMLIB=src/lib/exmm
-MODEXLIB16=src/lib/modex16
-MODEXLIB=src/lib/modex
-VGMSNDLIB=src/lib/vgmsnd
-DOSLIB=src/lib/doslib
-WCPULIB=src/lib/wcpu
-
-DOSLIB_CPU=src/lib/doslib/hw/cpu
-DOSLIB_DOS=src/lib/doslib/hw/dos
-DOSLIB_VGA=src/lib/doslib/hw/vga
-DOSLIB_8250=src/lib/doslib/hw/8250
-DOSLIB_JOYSTICK=src/lib/doslib/hw/joystick
-
-#
-# quiet flags
-#
-WLIBQ=-q
-WCLQ=-zq $(WLIBQ)
-UPXQ=-qqq
-
-#
-# compile flags
-#
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
-Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
-T_FLAGS=-bt=dos -mh -0 -fpi87
-
-CPPFLAGS=-DTARGET_MSDOS=16
-!ifeq DEBUGSERIAL 1
-CPPFLAGS += -DDEBUGSERIAL
-!endif
-AFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ)
-CFLAGS=$(WCLQ) $(T_FLAGS) -d1 -fo=.$(OBJ) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fm=$^&.mah
-LIBFLAGS=$(WLIBQ) -b -n
-
-#
-# objects
-#
-VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ)
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ)
-#16planar.$(OBJ) planar.$(OBJ)
-DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
-!ifeq DEBUGSERIAL 1
-DOSLIBOBJ += 8250.$(OBJ)
-!endif
-
-#
-# libraries
-#
-DOSLIBLIBS = $(DOSLIB_CPU)/dos86h/cpu.lib $(DOSLIB_DOS)/dos86h/dos.lib $(DOSLIB_VGA)/dos86h/vga.lib
-!ifeq DEBUGSERIAL 1
-DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
-!endif
-16LIB=16.lib
-
-#
-#	Files locations
-#
-.c : $(SRC);$(SRCLIB);$(MODEXLIB16);$(JSMNLIB);$(NYANLIB);$(VGMSNDLIB);$(WCPULIB)
-
-.asm : $(MODEXLIB)
-
-.lib : .;$(DOSLIB_CPU)/dos86h;$(DOSLIB_DOS)/dos86h;$(DOSLIB_VGA)/dos86h;$(DOSLIB_8250)/dos86h
-
-.obj : .
-
-#
-#	Default make rules
-#
-.c.obj:
-	*wcl $(CPPFLAGS) $(CFLAGS) $(extra_$^&_obj_opts) -c $[@
-
-.asm.obj:
-	*wcl $(AFLAGS) $(extra_$^&_obj_opts) -c $[@
-
-.obj.exe :
-	*wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
-
-.obj.lib :
-	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
-
-#
-# List of executables to build
-#
-TESTEXEC = &
-    test.exe &
-    test0.exe &
-    pcxtest.exe &
-    pcxtest2.exe &
-    palettec.exe &
-    maptest.exe &
-    fmemtest.exe &
-    fonttest.exe &
-    fontgfx.exe &
-    scroll.exe &
-    vgmtest.exe &
-    inputest.exe &
-    palettel.exe &
-    exmmtest.exe &
-    vrstest.exe
-EXEC = &
-    16.exe &
-    bakapi.exe &
-    tesuto.exe &
-    0.exe &
-    $(TESTEXEC)
-
-all: $(EXEC) joytest.exe
-
-#
-# game and bakapi executables
-#
-16.exe:           16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-bakapi.exe:       bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
-
-#
-# Test Executables!
-#
-scroll.exe:       scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-scroll.$(OBJ):    $(SRC)/scroll.c
-tesuto.exe:       tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
-tesuto.$(OBJ):    $(SRC)/tesuto.c
-0.exe:            0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-0.$(OBJ):         $(SRC)/0.c
-test.exe:         test.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-#test2.exe:       test2.$(OBJ) gfx.lib $(DOSLIBLIBS)
-test0.exe:        test0.$(OBJ)
-fonttest.exe:     fonttest.$(OBJ) gfx.lib
-#fonttes0.exe:    fonttes0.$(OBJ) $(16LIB)
-fontgfx.exe:      fontgfx.$(OBJ) gfx.lib $(DOSLIBLIBS)
-inputest.exe:     inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
-#sountest.exe:    sountest.$(OBJ) $(16LIB)
-pcxtest.exe:      pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS)
-vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
-palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
-pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
-#planrpcx.exe:    planrpcx.$(OBJ) gfx.lib
-maptest.exe:      maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) gfx.lib $(DOSLIBLIBS)
-fmemtest.exe:     fmemtest.$(OBJ)
-exmmtest.exe:     exmmtest.$(OBJ) $(16LIB)
-vgmtest.exe:      vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
-
-#
-# executable's objects
-#
-16.$(OBJ):        $(SRC)/16.c $(SRC)/16.h
-bakapi.$(OBJ):    $(SRC)/bakapi.c $(SRC)/bakapi.h
-test.$(OBJ):      $(SRC)/test.c $(SRCLIB)/modex16.h
-#test2.$(OBJ):    $(SRC)/test2.c $(SRCLIB)/modex16.h
-test0.$(OBJ):     $(SRC)/test0.c
-pcxtest.$(OBJ):   $(SRC)/pcxtest.c $(SRCLIB)/modex16.h
-vrstest.$(OBJ):   $(SRC)/vrstest.c $(SRCLIB)/modex16.h
-#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h
-pcxtest2.$(OBJ):  $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h
-palettec.$(OBJ):  $(SRC)/palettec.c
-palettel.$(OBJ):  $(SRC)/palettel.c
-maptest.$(OBJ):   $(SRC)/maptest.c $(SRCLIB)/modex16.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
-#sountest.$(OBJ): $(SRC)/sountest.c
-#miditest.$(OBJ): $(SRC)/miditest.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
-
-#
-# non executable objects libraries
-#
-
-16.lib: $(16LIBOBJS)
-vgmsnd.lib: $(VGMSNDOBJ)
-
-gfx.lib: $(GFXLIBOBJS)
-	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
-
-# extdep:
-# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
-
-# library deps 16-bit huge
-$(DOSLIB_CPU)/dos86h/cpu.lib:
-	cd $(DOSLIB_CPU:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-$(DOSLIB_DOS)/dos86h/dos.lib:
-	cd $(DOSLIB_DOS:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-$(DOSLIB_VGA)/dos86h/vgatty.lib:
-	cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-$(DOSLIB_VGA)/dos86h/vga.lib:
-	cd $(DOSLIB_VGA:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-$(DOSLIB_8250)/dos86h/8250.lib:
-	cd $(DOSLIB_8250:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-
-joytest.exe:
-	cd $(DOSLIB_JOYSTICK:$(to_os_path)) && .$(DIRSEP)make.sh && cd $(BUILD_ROOT)
-	$(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)dos86h$(DIRSEP)test.exe joytest.exe
-#$(DOSLIBLIBS): .symbolic
-#	@cd $(DOSLIB:$(to_os_path))
-#	@.$(DIRSEP)buildall.sh
-#	@cd $(BUILD_ROOT)
-
-modex16.$(OBJ):   $(SRCLIB)/modex16.c $(SRCLIB)/modex16.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 $(DOSLIBLIBS)
-16_sprit.$(OBJ):  $(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.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
-mapread.$(OBJ):   $(SRCLIB)/mapread.c $(SRCLIB)/mapread.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_ca.$(OBJ):     $(SRCLIB)/16_ca.c $(SRCLIB)/16_ca.h
-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_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
-wcpu.$(OBJ):      $(WCPULIB)/wcpu.c $(WCPULIB)/wcpu.h
-#memory.$(OBJ):   $(EXMMLIB)/memory.c $(EXMMLIB)/memory.h
-c_utils.$(OBJ):   $(MODEXLIB)/c_utils.asm
-modex.$(OBJ):     $(MODEXLIB)/modex.asm
-
-#
-#other~
-#
-clean: .symbolic
-	@$(REMOVECOMMAND) $(EXEC)
-	@$(REMOVECOMMAND) *.$(OBJ)
-!ifdef __LINUX__
-	@rm *.LIB
-!endif
-	@$(REMOVECOMMAND) 16.lib
-	@$(REMOVECOMMAND) gfx.lib
-	@$(REMOVECOMMAND) vgmsnd.lib
-	@*wlib -n $(WLIBQ) 16.lib
-	@*wlib -n $(WLIBQ) gfx.lib
-	@*wlib -n $(WLIBQ) vgmsnd.lib
-	@$(REMOVECOMMAND) *.16W
-	@$(REMOVECOMMAND) *.16B
-	@$(REMOVECOMMAND) *.OBJ
-	@$(REMOVECOMMAND) *.o
-	@$(REMOVECOMMAND) *.BCO
-	#@$(REMOVECOMMAND) makefi~1
-	#@$(REMOVECOMMAND) makefile~
-	@$(REMOVECOMMAND) __wcl__.LNK
-#	@$(REMOVECOMMAND) *.smp
-	@$(REMOVECOMMAND) *.SMP
-	@$(REMOVECOMMAND) *.hed
-	@$(REMOVECOMMAND) *.MAH
-	@$(REMOVECOMMAND) *.mah
-	@$(REMOVECOMMAND) *.err
-	@echo $(OBJ)
-	#@cd $(DOSLIB:$(to_os_path))
-	#@./buildall.sh clean
-	#@cd $(BUILD_ROOT)
-#	@$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
-#	@$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
-#	@$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
-#	@$(COPYCOMMAND) $(SRCLIB)16_ca.* $(EXMMTESTDIR)$(SRCLIB)
-#	@$(COPYCOMMAND) $(SRCLIB)16_hc.* $(EXMMTESTDIR)$(SRCLIB)
-#	@$(COPYCOMMAND) $(SRCLIB)types.h $(EXMMTESTDIR)$(SRCLIB)
-#	@$(COPYCOMMAND) $(NYANLIB)* $(EXMMTESTDIR)$(NYANLIB)
-#	@echo $(watcom)
-#	@echo $(INCLUDE)
-
-backupconfig: .symbolic
-	@$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
-	@$(COPYCOMMAND) .gitmodules git_modu.les
-	@$(COPYCOMMAND) .gitignore git_igno.re
-
-comp: .symbolic
-	@*upx -9 $(EXEC)
-
-comq: .symbolic
-	@*upx -9 $(UPXQ) $(EXEC)
-
-www: .symbolic
-	@ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*'
-	#@rm -f /var/www/$(EXEC)*
-	@rm -f /var/www/*.exe.zip*
-	#@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP)
-	@./src/util/z.sh $(EXEC) $(EXEC)
-	@scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/
-	@scp -r -P 26 x4get.bat 4ch.mooo.com:/var/www/16/
-	@scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/
-
-getwww: .symbolic
-	*x4get.bat $(EXEC)
-
-vomitchan: .symbolic
-	@$(DUMP) *.err
-
-##
-##	External library management~ ^^
-##
-#git submodule add <repo>
-mkdl: .symbolic
-	@cd $(DOSLIB:$(to_os_path))
-	@./buildall.sh
-	@cd $(BUILD_ROOT)
-
-uplibs: .symbolic
-	@cd $(JSMNLIB:$(to_os_path))
-	@git pull
-	@cd $(BUILD_ROOT)
-	@cd $(DOSLIB:$(to_os_path))
-	@git pull
-	@cd $(BUILD_ROOT)
-
-reinitlibs: .symbolic
-	@rm -rf $(SRCLIB)doslib
-	@rm -rf $(SRCLIB)jsmn
-	@rm -rf 16/CatacombApocalypse
-	@rm -rf 16/wolf3d
-	@rm -rf 16/keen
-	@wmake -h initlibs
-
-initlibs: .symbolic
-	@cp git_con.fig .git/config
-	@cp git_modu.les .gitmodules
-	@cp git_igno.re .gitignore
-	@cd $(SRCLIB:$(to_os_path))
-	@git clone https://github.com/joncampbell123/doslib.git
-	@git clone https://github.com/zserge/jsmn.git
-	@cd $(BUILD_ROOT)
-	@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
-	@cd $(BUILD_ROOT)
-	@cp $(DOSLIB)/make-lowercase .
-
-##
-##	experimental libs
-##
-xlib: .symbolic
-	@cd 16$(DIRSEP)xlib
-	@wmake -h clean
-	@wmake -h all
-	@cd $(BUILD_ROOT)
-
-mx: .symbolic
-	@cd 16$(DIRSEP)xw
-#	@wmake clean
-	@wmake -h all
-	@cd $(BUILD_ROOT)
-
-mx_: .symbolic
-	@cd 16$(DIRSEP)xw_
-	@wmake -h -f makefile all
-	@cd $(BUILD_ROOT)
-
-vrs: .symbolic
-	@cd $(DOSLIB_VGA:$(to_os_path))
-	#@make clean
-	@make all
-	@mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
-	@mv pcxsscut $(BUILD_ROOT)$(DIRSEP)
-	@mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)
-	@mv vrsdump $(BUILD_ROOT)$(DIRSEP)
-	@cd $(BUILD_ROOT)