From: sparky4 <sparky4@cock.li>
Date: Fri, 6 Jan 2017 17:37:22 +0000 (-0600)
Subject: makefile polished!!
X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=32a94c33de59a927237406cd68743b94db1ebc46

makefile polished!!
---

diff --git a/src/_scroll.c b/16/src/_scroll.c
similarity index 100%
rename from src/_scroll.c
rename to 16/src/_scroll.c
diff --git a/swapbranchcode.sh b/16/swapbranchcode.sh
similarity index 100%
rename from swapbranchcode.sh
rename to 16/swapbranchcode.sh
diff --git a/DEBUG.16W b/DEBUG.16W
deleted file mode 100755
index 8f489286..00000000
--- a/DEBUG.16W
+++ /dev/null
@@ -1,210 +0,0 @@
-[0mSeg:0	Size:10276	Owner:0x0
-[41;31m+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m[42;32m0000
-[0m[0mSeg:290d	Size:44	Owner:0x0
-[41;31m+[0m[42;32m
-[0m[0mSeg:2939	Size:256	Owner:0x1650
-[44;34m+++++[0m[42;32m
-[0m[0mSeg:2a39	Size:256	Owner:0x1442
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2b39	Size:256	Owner:0x1444
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2c39	Size:256	Owner:0x1446
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2d39	Size:256	Owner:0x1448
-[45;35m++++[0m[42;32m
-[0m[0mSeg:2e39	Size:256	Owner:0x144a
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:2f39	Size:256	Owner:0x144c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3039	Size:256	Owner:0x144e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3139	Size:256	Owner:0x1450
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3239	Size:256	Owner:0x1452
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3339	Size:256	Owner:0x1454
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:3439	Size:256	Owner:0x1456
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3539	Size:256	Owner:0x1458
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3639	Size:256	Owner:0x145a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3739	Size:256	Owner:0x145c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3839	Size:256	Owner:0x145e
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:3939	Size:256	Owner:0x1460
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3a39	Size:256	Owner:0x1462
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3b39	Size:256	Owner:0x1464
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3c39	Size:256	Owner:0x1466
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3d39	Size:256	Owner:0x1468
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:3e39	Size:256	Owner:0x146a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:3f39	Size:256	Owner:0x146c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4039	Size:256	Owner:0x146e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4139	Size:256	Owner:0x1470
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4239	Size:256	Owner:0x1472
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:4339	Size:256	Owner:0x1474
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4439	Size:256	Owner:0x1476
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4539	Size:256	Owner:0x1478
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4639	Size:256	Owner:0x147a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4739	Size:256	Owner:0x147c
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:4839	Size:256	Owner:0x147e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4939	Size:256	Owner:0x1480
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4a39	Size:256	Owner:0x1482
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4b39	Size:256	Owner:0x1484
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4c39	Size:256	Owner:0x1486
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:4d39	Size:256	Owner:0x1488
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4e39	Size:256	Owner:0x148a
-[45;35m++++[0m[42;32m
-[0m[0mSeg:4f39	Size:256	Owner:0x148c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5039	Size:256	Owner:0x148e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5139	Size:256	Owner:0x1490
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5239	Size:256	Owner:0x1492
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5339	Size:256	Owner:0x1494
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5439	Size:256	Owner:0x1496
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5539	Size:256	Owner:0x1498
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5639	Size:256	Owner:0x149a
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5739	Size:256	Owner:0x149c
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5839	Size:256	Owner:0x149e
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5939	Size:256	Owner:0x14a0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5a39	Size:256	Owner:0x14a2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5b39	Size:256	Owner:0x14a4
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:5c39	Size:256	Owner:0x14a6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5d39	Size:256	Owner:0x14a8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5e39	Size:256	Owner:0x14aa
-[45;35m++++[0m[42;32m
-[0m[0mSeg:5f39	Size:256	Owner:0x14ac
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6039	Size:256	Owner:0x14ae
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:6139	Size:256	Owner:0x14b0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6239	Size:256	Owner:0x14b2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6339	Size:256	Owner:0x14b4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6439	Size:256	Owner:0x14b6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6539	Size:256	Owner:0x14b8
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:6639	Size:256	Owner:0x14ba
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6739	Size:256	Owner:0x14bc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6839	Size:256	Owner:0x14be
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6939	Size:256	Owner:0x14c0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6a39	Size:256	Owner:0x14c2
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:6b39	Size:256	Owner:0x14c4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6c39	Size:256	Owner:0x14c6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6d39	Size:256	Owner:0x14c8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6e39	Size:256	Owner:0x14ca
-[45;35m++++[0m[42;32m
-[0m[0mSeg:6f39	Size:256	Owner:0x14cc
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7039	Size:256	Owner:0x14ce
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7139	Size:256	Owner:0x14d0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7239	Size:256	Owner:0x14d2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7339	Size:256	Owner:0x14d4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7439	Size:256	Owner:0x14d6
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7539	Size:256	Owner:0x14d8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7639	Size:256	Owner:0x14da
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7739	Size:256	Owner:0x14dc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7839	Size:256	Owner:0x14de
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7939	Size:256	Owner:0x14e0
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7a39	Size:256	Owner:0x14e2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7b39	Size:256	Owner:0x14e4
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7c39	Size:256	Owner:0x14e6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7d39	Size:256	Owner:0x14e8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:7e39	Size:256	Owner:0x14ea
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:7f39	Size:256	Owner:0x14ec
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8039	Size:256	Owner:0x14ee
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8139	Size:256	Owner:0x14f0
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8239	Size:256	Owner:0x14f2
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8339	Size:256	Owner:0x14f4
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:8439	Size:256	Owner:0x14f6
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8539	Size:256	Owner:0x14f8
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8639	Size:256	Owner:0x14fa
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8739	Size:256	Owner:0x14fc
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8839	Size:256	Owner:0x14fe
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:8939	Size:256	Owner:0x1500
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8a39	Size:256	Owner:0x1502
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8b39	Size:256	Owner:0x1504
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8c39	Size:256	Owner:0x1506
-[45;35m++++[0m[42;32m
-[0m[0mSeg:8d39	Size:256	Owner:0x1508
-[45;35m+++++[0m[42;32m
-[0m[0mSeg:8e39	Size:401	Owner:0xec1c
-[44;34m++++++[0m[42;32m
-[0m[0mSeg:b939	Size:18118	Owner:0x0
-[41;31m++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++[0m
\ No newline at end of file
diff --git a/HEAP.16W b/HEAP.16W
deleted file mode 100755
index 2eed9231..00000000
--- a/HEAP.16W
+++ /dev/null
@@ -1,69 +0,0 @@
-
-	== default ==
-
-  USED block at 292f0016 of size 136
-  FREE block at 292f009e of size 68
-  USED block at 292f00e2 of size 50
-  USED block at 292f0114 of size 50
-  USED block at 292f0146 of size 50
-  USED block at 292f0178 of size 50
-  USED block at 292f01aa of size 50
-  USED block at 292f01dc of size 50
-  USED block at 292f020e of size 50
-  USED block at 292f0240 of size 50
-  USED block at 292f0272 of size 50
-  USED block at 292f02a4 of size 50
-  USED block at 292f02d6 of size 50
-  USED block at 292f0308 of size 50
-  FREE block at 292f033a of size 14
-  USED block at 292f0348 of size 20
-  FREE block at 292f035c of size 7328
-OK - end of heap
-
-	== near ==
-
-  USED block at 192eec66 of size 12
-  USED block at 192eec72 of size 564
-  USED block at 192eeea6 of size 72
-  USED block at 192eeeee of size 20
-  USED block at 192eef02 of size 20
-  USED block at 192eef16 of size 20
-  USED block at 192eef2a of size 20
-  USED block at 192eef3e of size 20
-  USED block at 192eef52 of size 4266
-OK - end of heap
-
-	== far ==
-
-  USED block at 292f0016 of size 136
-  USED block at 292f009e of size 68
-  USED block at 292f00e2 of size 50
-  USED block at 292f0114 of size 50
-  USED block at 292f0146 of size 50
-  USED block at 292f0178 of size 50
-  USED block at 292f01aa of size 50
-  USED block at 292f01dc of size 50
-  USED block at 292f020e of size 50
-  USED block at 292f0240 of size 50
-  USED block at 292f0272 of size 50
-  USED block at 292f02a4 of size 50
-  USED block at 292f02d6 of size 50
-  USED block at 292f0308 of size 50
-  USED block at 292f033a of size 14
-  USED block at 292f0348 of size 20
-  USED block at 292f035c of size 7328
-OK - end of heap
-
-Memory Type         Total      Used       Free
-----------------  --------   --------   --------
-Default		   8166		756	  7410
-Near		   5014		748	  4266
-Far		   8166		756	  7410
-----------------  --------   --------   --------
-coreleft = 4264
-farcoreleft = 27902
-GetFreeSize = 23660
-GetNearFreeSize = 4266
-GetFarFreeSize = 23660
-memavl = 4264
-stackavail = 31539
diff --git a/MEMINFO.16W b/MEMINFO.16W
deleted file mode 100755
index e69de29b..00000000
diff --git a/MMDUMP.16W b/MMDUMP.16W
deleted file mode 100755
index 55e51064..00000000
Binary files a/MMDUMP.16W and /dev/null differ
diff --git a/data/G.PAL b/data/G.PAL
index 906897bc..0ecbac33 100755
Binary files a/data/G.PAL and b/data/G.PAL differ
diff --git a/db.exe b/db.exe
index af80cac8..457a9fa1 100755
Binary files a/db.exe and b/db.exe differ
diff --git a/makefile b/makefile
index 49039237..116be140 100755
--- a/makefile
+++ b/makefile
@@ -40,7 +40,7 @@ to_os_path=\=/
 REMOVECOMMAND=rm -f
 COPYCOMMAND=cp -f
 DIRSEP=/
-OBJ=obj
+OBJ=o
 DUMP=cat
 DOSLIBMAKE=./make.sh build all
 DOSLIBMAKEALL=./buildall.sh build all
@@ -71,14 +71,14 @@ EXMMLIB=$(SRCLIB)/exmm
 MODEXLIB16=$(SRCLIB)/16_vl
 MODEXLIB=$(SRCLIB)/modex
 VGMSNDLIB=$(SRCLIB)/vgmsnd
-DOSLIB=$(SRCLIB)/doslib
+DOSLIBDIR=$(SRCLIB)/doslib
 WCPULIB=$(SRCLIB)/wcpu
 
-DOSLIB_CPU=$(DOSLIB)/hw/cpu
-DOSLIB_DOS=$(DOSLIB)/hw/dos
-DOSLIB_VGA=$(DOSLIB)/hw/vga
-DOSLIB_8250=$(DOSLIB)/hw/8250
-DOSLIB_JOYSTICK=$(DOSLIB)/hw/joystick
+DOSLIB_CPU=$(DOSLIBDIR)/hw/cpu
+DOSLIB_DOS=$(DOSLIBDIR)/hw/dos
+DOSLIB_VGA=$(DOSLIBDIR)/hw/vga
+DOSLIB_8250=$(DOSLIBDIR)/hw/8250
+DOSLIB_JOYSTICK=$(DOSLIBDIR)/hw/joystick
 DOSLIB_MEMMODE=dos86$(MEMORYMODE)
 
 # remote host (for sparky4)
@@ -91,24 +91,25 @@ HOSTPORT=22
 # quiet flags
 #
 WLIBQ=-q
-WCLQ=-q
+WCLQ=-zq
 UPXQ=-qqq
 
 #
 # compile flags
 #
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -zq -k32768#54096#60000
+S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
 Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-obmilr -oe=24 -out -oh -ei -onac -ol+ -ok##x
-T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -fo=.$(OBJ) -d1###### -e=65536
+O_FLAGS=-obmilr -oe=24 -outpack -ei -ohnl+				-zp4
+T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536
 
+DBUGFLAGS=-fm=$^&.mah -fd=$^&
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
 !endif
 AFLAGS=$(WCLQ) $(T_FLAGS)
-CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIB)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
-LFLAGS=$(WCLQ) -l=dos -fd -fm=$^&.mah $(S_FLAGS)
+CFLAGS=$(WCLQ) $(T_FLAGS) -wo -i"$(DOSLIBDIR)" $(O_FLAGS) $(S_FLAGS) $(Z_FLAGS)
+LFLAGS=$(WCLQ) -l=dos $(S_FLAGS)		$(DBUGFLAGS)
 LIBFLAGS=$(WLIBQ) -b -n
 
 #
@@ -118,7 +119,6 @@ VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(OBJ) $(OLDLIBOBJS)
 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
-#16planar.$(OBJ) planar.$(OBJ) mapread.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -131,7 +131,8 @@ DOSLIBLIBS = $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib $(DOSLIB_DOS)/$(DOSLIB_MEMM
 !ifeq DEBUGSERIAL 1
 DOSLIBLIBS += $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib
 !endif
-16LIB=$(16LIBOBJS)#16.lib bad program lock up
+DOSLIB=doslib.lib
+16LIB=16.lib
 
 #
 #	Files locations
@@ -142,23 +143,24 @@ DOSLIBLIBS += $(DOSLIB_8250)/$(DOSLIB_MEMMODE)/8250.lib
 
 .lib : .;$(DOSLIB_CPU)/$(DOSLIB_MEMMODE);$(DOSLIB_DOS)/$(DOSLIB_MEMMODE);$(DOSLIB_VGA)/$(DOSLIB_MEMMODE);$(DOSLIB_8250)/$(DOSLIB_MEMMODE)
 
-.obj : .
+.$(OBJ) : .
 
 #
 #	Default make rules
 #
-.c.obj:
-	*wcl $(CPPFLAGS) $(CFLAGS) $(extra_$^&_obj_opts) -c $[@
+.c.$(OBJ):
+	*wcl $(CFLAGS) $(extra_$^&_obj_opts)		$(CPPFLAGS) -c $[@
 
-.asm.obj:
-	*wcl $(AFLAGS) $(extra_$^&_obj_opts) -c $[@
+.asm.$(OBJ):
+	*wcl $(AFLAGS) $(extra_$^&_obj_opts)		-c $[@
 
 #CFLAGS is neccessary here
-.obj.exe :
-	*wcl $(LFLAGS) $(extra_$^&_exe_opts) -fe=$@ $<
+.$(OBJ).exe :
+	*wcl $(LFLAGS) $(extra_$^&_exe_opts)$<		-fe=$@
 
-.obj.lib :
-	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
+LIBMAKERULE=*wlib $(LIBFLAGS) $(extra_$^&_lib_opts)$@ $<
+.$(OBJ).lib :
+	$(LIBMAKERULE)
 
 #
 # List of executables to build
@@ -201,41 +203,41 @@ testexec: $(EXEC) $(TESTEXEC2)
 #
 # game and bakapi executables
 #
-16.exe:		16.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-bakapi.exe:		bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
+16.exe:		16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+bakapi.exe:		bakapi.$(OBJ) gfx.lib $(DOSLIB)
 
 #
 # Test Executables!
 #
-scroll.exe:	scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+scroll.exe:	scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ):	$(SRC)/scroll.c
-zcroll.exe:	zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+zcroll.exe:	zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ):	$(SRC)/zcroll.c
-tesuto.exe:	tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
+tesuto.exe:	tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
 tesuto.$(OBJ):	$(SRC)/tesuto.c
-0.exe:			0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+0.exe:			0.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 0.$(OBJ):		 $(SRC)/0.c
-test.exe:		 test.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-#test2.exe:	test2.$(OBJ) gfx.lib $(DOSLIBLIBS)
+test.exe:		 test.$(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 $(DOSLIBLIBS)
-inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
+fontgfx.exe:	fontgfx.$(OBJ) gfx.lib $(DOSLIB)
+inputest.exe:	 inputest.$(OBJ) $(16LIB) $(DOSLIB)
 #sountest.exe:	sountest.$(OBJ) $(16LIB)
-pcxtest.exe:	pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB)##++++
-vrstest.exe:	vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
-#vgacamm.exe:	vgacamm.$(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)
+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)
+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 $(DOSLIBLIBS)
+maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
 fmemtest.exe:	 fmemtest.$(OBJ)
-exmmtest.exe:	 exmmtest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
-vgmtest.exe:	vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIBLIBS)
+exmmtest.exe:	 exmmtest.$(OBJ) $(16LIB) $(DOSLIB)
+vgmtest.exe:	vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB)
 db.exe:		db.$(OBJ)
-wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIBLIBS)
+wcpu.exe:		wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 
 #
 # executable's objects
@@ -274,14 +276,15 @@ db.$(OBJ):		$(UTIL)/db.c
 #
 16.lib: $(16LIBOBJS)
 vgmsnd.lib: $(VGMSNDOBJ)
-
 gfx.lib: $(GFXLIBOBJS)
-	*wlib $(LIBFLAGS) $(extra_$^&_lib_opts) $@ $<
+	$(LIBMAKERULE)
+doslib.lib: $(DOSLIBLIBS)
+	$(LIBMAKERULE)
 
 #
 #	doslib
 #
-# library deps 16-bit huge
+# library deps 16-bit large
 $(DOSLIB_CPU)/$(DOSLIB_MEMMODE)/cpu.lib:
 	cd $(DOSLIB_CPU:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
 $(DOSLIB_DOS)/$(DOSLIB_MEMMODE)/dos.lib:
@@ -301,7 +304,7 @@ joytest.exe:
 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_vrs.$(OBJ):	$(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIB)
 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
@@ -332,15 +335,17 @@ modex.$(OBJ):	 $(MODEXLIB)/modex.asm
 #other~
 #
 clean: .symbolic
-	@if not exist $(DOSLIB)/buildall.sh wmake -h initlibs
+	@if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
 	@for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
 	@rm *.LIB
 	@. src/util/bcexmm.sh
 	@rm *.EXE
-!endif
-	@if exist *.obj $(REMOVECOMMAND) *.obj
 	@if exist *.OBJ $(REMOVECOMMAND) *.OBJ
+!else
+	@if exist *.o $(REMOVECOMMAND) *.o
+!endif
+	@if exist *.$(OBJ) $(REMOVECOMMAND) *.$(OBJ)
 	@if exist *.bco $(REMOVECOMMAND) *.bco
 	@if exist *.BCO $(REMOVECOMMAND) *.BCO
 	@if exist *.LIB $(REMOVECOMMAND) *.LIB
@@ -417,12 +422,12 @@ uplibs: .symbolic
 	@cd $(JSMNLIB:$(to_os_path))
 	@git pull
 	@cd $(BUILD_ROOT)
-	@cd $(DOSLIB:$(to_os_path))
+	@cd $(DOSLIBDIR:$(to_os_path))
 	@git pull
 	@cd $(BUILD_ROOT)
 
 reinitlibs: .symbolic
-	@$(REMOVECOMMAND) -rf $(DOSLIB)
+	@$(REMOVECOMMAND) -rf $(DOSLIBDIR)
 	@$(REMOVECOMMAND) -rf $(JSMNLIB)
 	@$(REMOVECOMMAND) -rf 16/CatacombApocalypse
 	@$(REMOVECOMMAND) -rf 16/wolf3d
@@ -441,7 +446,7 @@ initlibs: .symbolic
 	@git clone https://github.com/keendreams/keen.git
 	@git clone https://github.com/FlatRockSoft/Catacomb3D.git
 	@cd $(BUILD_ROOT)
-	@$(COPYCOMMAND) $(DOSLIB)/make-lowercase .
+	@$(COPYCOMMAND) $(DOSLIBDIR)/make-lowercase .
 
 getlib: .symbolic
 	@cd $(SRCLIB:$(to_os_path))
diff --git a/src/lib/doslib b/src/lib/doslib
index 912a2929..12428fa3 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 912a29296248429f341b4727b441fb36c3e823a5
+Subproject commit 12428fa3369141cd22cd4497511f9c2068f06013
diff --git a/wcpu.exe b/wcpu.exe
index cdc348c1..47dc4110 100755
Binary files a/wcpu.exe and b/wcpu.exe differ