X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=dcff5a19c3a7e5c2ebece67109681d750b4d772d;hb=2d5ca153b7b6859e1cab8a3104317d4e64a19895;hp=1b910a0a420490354d26de4a1eee92a69297b38d;hpb=4d315153f6836d4be8740f387cead28173fdaa55;p=16.git

diff --git a/makefile b/makefile
index 1b910a0a..dcff5a19 100755
--- a/makefile
+++ b/makefile
@@ -41,12 +41,18 @@ COPYCOMMAND=cp -f
 DIRSEP=/
 OBJ=o
 DUMP=cat
-!else
-REMOVECOMMAND=del
-COPYCOMMAND=copy /y
+WCL=wcl
+WLIB=wlib
+UPX=upx
+!else		#DOS ^^
+REMOVECOMMAND=*del
+COPYCOMMAND=*copy /y
 DIRSEP=\
-OBJ=obj
-DUMP=type
+OBJ=OBJ
+DUMP=*type
+WCL=*wcl
+WLIB=*wlib
+UPX=*upx
 !endif
 
 TARGET_OS = dos
@@ -82,8 +88,8 @@ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000
 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
 ZFLAGS=-zk0 -zc -zp8 -zm $(WCLQ)
 LFLAGS=-lr -l=dos
-CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAGS)
-OFLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
+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)
 
 #
@@ -92,8 +98,7 @@ FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
 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)
+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
 
@@ -103,8 +108,8 @@ 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
-#planrpcx.exe test2.exe
+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
@@ -115,193 +120,188 @@ all: $(EXEC) joytest.exe
 !ifeq DEBUGSERIAL 1
 16LIBOBJS += $(DOSLIBLIBS)
 !endif
+
 #
 #game and bakapi executables
 #
 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
+	$(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
-#modex.lib
+	$(WCL) $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.mah
+
 #
 #Test Executables!
 #
 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
+	$(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
+	$(WCL) $(FLAGS) -c $(SRC)scroll.c
 
-
-# NOTE: dos86h = 16-bit huge memory model. memory model must match!
 tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
-#	%write tmp.cmd option quiet option max=tesuto.mah $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe
-#	%write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib
-#	%write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib
-#	@wlink @tmp.cmd
-
-#
-# add this ww to reduce junk www
-#
-# NTS we have to construct the command line into tmp.cmd because for MS-DOS
-# systems all arguments would exceed the pitiful 128 char command line limit
-#.C.OBJ:
-#	%write temp.cmd $(CFLAGS_THIS) $(CFLAGS_CON) $[@
-#	wcl @temp.cmd
-#
-	wcl $(FLAGS) $(WCLQ) 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
+	$(WCL) $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
 
 0.exe: 0.$(OBJ) $(DOSLIBLIBS) gfx.lib $(16LIB)
-	wcl $(FLAGS) $(WCLQ) 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
+	$(WCL) $(FLAGS) $(WCLQ) -c $(SRC)0.c
 
 test.exe: test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB)
-	wcl $(FLAGS) test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB) -fm=test.mah
+	$(WCL) $(FLAGS) test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB) -fm=test.mah
 
 #test2.exe: test2.$(OBJ) $(DOSLIBLIBS) gfx.lib
-#	wcl $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah
+#	$(WCL) $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah
 
 test0.exe: test0.$(OBJ)
-	wcl $(FLAGS) test0.$(OBJ) -fm=test0.mah
+	$(WCL) $(FLAGS) test0.$(OBJ) -fm=test0.mah
 
 fonttest.exe: fonttest.$(OBJ) $(16LIB) gfx.lib
-	wcl $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah
+	$(WCL) $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah
 
 #fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
-#	wcl $(FLAGS) 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
+	$(WCL) $(FLAGS) fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah
 
 inputest.exe: inputest.$(OBJ) $(16LIB)
-	wcl $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah
+	$(WCL) $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah
 
 #sountest.exe: sountest.$(OBJ) $(16LIB)
-#	wcl $(FLAGS) sountest.$(OBJ) $(16LIB)
+#	$(WCL) $(FLAGS) sountest.$(OBJ) $(16LIB)
 
 pcxtest.exe: pcxtest.$(OBJ) gfx.lib
-	wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah
+	$(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)
+	$(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)
+	$(WCL) $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIB)
 
 pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib
-	wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah
+	$(WCL) $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah
 
 ##planrpcx.exe: planrpcx.$(OBJ) gfx.lib
-##	wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah
+##	$(WCL) $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah
 
 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
+	$(WCL) $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=maptest.mah
 
 fmemtest.exe: fmemtest.$(OBJ) $(16LIB)
-	wcl $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah
+	$(WCL) $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah
 
 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)
-####0000	./wlink32 @__wcl__.lnk
+	$(WCL) $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB)
 
 vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB)
-	wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIB)
-	#====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.mah
+	$(WCL) $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIB)
 
 
 #
 #executable's objects
 #
+!ifndef __LINUX__
+#{$(SRC)}.c.$(OBJ) :
+{src}.c.$(OBJ) :
+	$(WCL) $(FLAGS) -c $[*
+!endif
+
 16.$(OBJ): $(SRC)16.h $(SRC)16.c
-	wcl $(FLAGS) -c $(SRC)16.c
+	$(WCL) $(FLAGS) -c $(SRC)16.c
 
 bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c
-	wcl $(FLAGS) -c $(SRC)bakapi.c
+	$(WCL) $(FLAGS) -c $(SRC)bakapi.c
 
 test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)test.c
+	$(WCL) $(FLAGS) -c $(SRC)test.c
 
 #test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
-#	wcl $(FLAGS) -c $(SRC)test2.c
+#	$(WCL) $(FLAGS) -c $(SRC)test2.c
 
 test0.$(OBJ): $(SRC)test0.c
-	wcl $(FLAGS) -c $(SRC)test0.c
+	$(WCL) $(FLAGS) -c $(SRC)test0.c
 
 pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)pcxtest.c
+	$(WCL) $(FLAGS) -c $(SRC)pcxtest.c
+
+vrstest.$(OBJ): $(SRC)vrstest.c $(SRCLIB)modex16.h
+	$(WCL) $(FLAGS) -c $(SRC)vrstest.c
 
 ##planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h
-##	wcl $(FLAGS) -c $(SRC)planrpcx.c
+##	$(WCL) $(FLAGS) -c $(SRC)planrpcx.c
 
 pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)pcxtest2.c
+	$(WCL) $(FLAGS) -c $(SRC)pcxtest2.c
 
 palettec.$(OBJ): $(SRC)palettec.c
-	wcl $(FLAGS) -c $(SRC)palettec.c
+	$(WCL) $(FLAGS) -c $(SRC)palettec.c
 
 palettel.$(OBJ): $(SRC)palettel.c
-	wcl $(FLAGS) -c $(SRC)palettel.c
+	$(WCL) $(FLAGS) -c $(SRC)palettel.c
 
 maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
-	wcl $(FLAGS) -c $(SRC)maptest.c
+	$(WCL) $(FLAGS) -c $(SRC)maptest.c
 
 #emmtest.$(OBJ): $(SRC)emmtest.c
-#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
+#	$(WCL) $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
 
 #emsdump.$(OBJ): $(SRC)emsdump.c
-#	wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
+#	$(WCL) $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
 
 fmemtest.$(OBJ): $(SRC)fmemtest.c
-	wcl $(FLAGS) -c $(SRC)fmemtest.c
+	$(WCL) $(FLAGS) -c $(SRC)fmemtest.c
 
 fonttest.$(OBJ): $(SRC)fonttest.c
-	wcl $(FLAGS) -c $(SRC)fonttest.c
+	$(WCL) $(FLAGS) -c $(SRC)fonttest.c
 
 #fonttes0.$(OBJ): $(SRC)fonttes0.c
-#	wcl $(FLAGS) -c $(SRC)fonttes0.c
+#	$(WCL) $(FLAGS) -c $(SRC)fonttes0.c
 
 fontgfx.$(OBJ): $(SRC)fontgfx.c
-	wcl $(FLAGS) -c $(SRC)fontgfx.c
+	$(WCL) $(FLAGS) -c $(SRC)fontgfx.c
 
 inputest.$(OBJ): $(SRC)inputest.c
-	wcl $(FLAGS) -c $(SRC)inputest.c
+	$(WCL) $(FLAGS) -c $(SRC)inputest.c
 
 #sountest.$(OBJ): $(SRC)sountest.c
-#	wcl $(FLAGS) -c $(SRC)sountest.c
+#	$(WCL) $(FLAGS) -c $(SRC)sountest.c
 
 #miditest.$(OBJ): $(SRC)miditest.c
-#	wcl $(FLAGS) -c $(SRC)miditest.c
+#	$(WCL) $(FLAGS) -c $(SRC)miditest.c
 
 #testemm.$(OBJ): $(SRC)testemm.c
-#	wcl $(FLAGS) -c $(SRC)testemm.c
+#	$(WCL) $(FLAGS) -c $(SRC)testemm.c
 
 #testemm0.$(OBJ): $(SRC)testemm0.c
-#	wcl $(FLAGS) -c $(SRC)testemm0.c
+#	$(WCL) $(FLAGS) -c $(SRC)testemm0.c
 
 tsthimem.$(OBJ): $(SRC)tsthimem.c
-	wcl $(FLAGS) -c $(SRC)tsthimem.c
+	$(WCL) $(FLAGS) -c $(SRC)tsthimem.c
 
 exmmtest.$(OBJ): $(SRC)exmmtest.c
-	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)
+	$(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
-	wcl $(FLAGS) -c $(SRC)vgmtest.c
-	#====wcl -mc -c $(SRC)vgmtest.c
+	$(WCL) $(FLAGS) -c $(SRC)vgmtest.c
+	#====$(WCL) -mc -c $(SRC)vgmtest.c
 
 #
 #non executable objects libraries
 #
 16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib
-	wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
+	$(WLIB) -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib
 
 gfx.lib: $(GFXLIBOBJS)
-	wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
+	$(WLIB) -b $(WLIBQ) gfx.lib $(GFXLIBOBJS)
 
 vgmsnd.lib: $(VGMSNDOBJ)
-	wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
+	$(WLIB) -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ)
 
 # extdep:
 # !include $(DOSLIBDIR)$(DIRSEP)extdep.mak
@@ -326,83 +326,86 @@ joytest.exe:
 #	@cd $(PDIR)$(PDIR)$(PDIR)
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
-	wcl $(FLAGS) -c $(SRCLIB)modex16.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)modex16.c
 
 bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c
-	wcl $(FLAGS) -c $(SRCLIB)bakapee.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)bakapee.c
 
 16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c
-	wcl $(FLAGS) -c $(MODEXLIB)16render.c
+	$(WCL) $(FLAGS) -c $(MODEXLIB)16render.c
 
 ##16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c
-##	wcl $(FLAGS) -c $(MODEXLIB)16planar.c
+##	$(WCL) $(FLAGS) -c $(MODEXLIB)16planar.c
+
+16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS)
+16_sprit.$(OBJ): $(SRCLIB)16_sprit.h $(SRCLIB)16_sprit.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_sprit.c
 
-16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c
-	wcl $(FLAGS) -c $(SRCLIB)16_vrs.c
 
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
-	wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)bitmap.c
 
 ##planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
-##	wcl $(FLAGS) -c $(SRCLIB)planar.c
+##	$(WCL) $(FLAGS) -c $(SRCLIB)planar.c
 
 scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
-	wcl $(FLAGS) -c $(SRCLIB)scroll16.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)scroll16.c
 
 wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
-	wcl $(FLAGS) -c $(WCPULIB)wcpu.c
+	$(WCL) $(FLAGS) -c $(WCPULIB)wcpu.c
 
 16text.$(OBJ): $(SRCLIB)16text.c
-	wcl $(FLAGS) -c $(SRCLIB)16text.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16text.c
 
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c
-	wcl $(FLAGS) -c $(SRCLIB)mapread.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)mapread.c
 
 16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c
-	wcl $(FLAGS) -c $(SRCLIB)16_timer.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_timer.c
 
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
-	wcl $(FLAGS) -c $(SRCLIB)16_in.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_in.c
 
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
-	wcl $(FLAGS) -c $(SRCLIB)16_mm.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_mm.c
 
 16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c
-	wcl $(FLAGS) -c $(SRCLIB)16_ca.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_ca.c
 
 16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c
-	wcl $(FLAGS) -c $(SRCLIB)16_dbg.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_dbg.c
 
 midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c
-	wcl $(FLAGS) -c $(SRCLIB)midi.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)midi.c
 
 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c
-	wcl $(FLAGS) -c $(SRCLIB)16_head.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_head.c
 
 16_hc.$(OBJ): $(SRCLIB)16_hc.h $(SRCLIB)16_hc.c
-	wcl $(FLAGS) -c $(SRCLIB)16_hc.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_hc.c
 
 16_snd.$(OBJ): $(SRCLIB)16_snd.h $(SRCLIB)16_snd.c
-	wcl $(FLAGS) -c $(SRCLIB)16_snd.c
-	#====wcl -mc -c $(SRCLIB)16_snd.c
+	$(WCL) $(FLAGS) -c $(SRCLIB)16_snd.c
+	#====$(WCL) -mc -c $(SRCLIB)16_snd.c
 
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
-	wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
+	$(WCL) $(FLAGS) -c $(JSMNLIB)jsmn.c
 
 kitten.$(OBJ): $(NYANLIB)kitten.h $(NYANLIB)kitten.c
-	wcl $(FLAGS) -c $(NYANLIB)kitten.c
+	$(WCL) $(FLAGS) -c $(NYANLIB)kitten.c
 
 vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c
-	wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
-	#====wcl -c -mc $(VGMSNDLIB)vgmSnd.c
+	$(WCL) $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c
+	#====$(WCL) -c -mc $(VGMSNDLIB)vgmSnd.c
 
 #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
-#	wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
+#	$(WCL) $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
 
 c_utils.$(OBJ): $(MODEXLIB_)c_utils.asm
-	wcl -c $(AFLAGS) $(MODEXLIB_)c_utils.asm
+	$(WCL) -c $(AFLAGS) $(MODEXLIB_)c_utils.asm
 modex.$(OBJ): $(MODEXLIB_)modex.asm
-	wcl -c $(AFLAGS) $(MODEXLIB_)modex.asm
+	$(WCL) -c $(AFLAGS) $(MODEXLIB_)modex.asm
 
 #
 #other~
@@ -413,17 +416,17 @@ clean: .symbolic
 	@$(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) *.16
+	@$(REMOVECOMMAND) *.LIB	#dos
+	@$(WLIB) -n $(WLIBQ) 16.lib
+	@$(WLIB) -n $(WLIBQ) gfx.lib
+	@$(WLIB) -n $(WLIBQ) vgmsnd.lib
 	@$(REMOVECOMMAND) *.16W
 	@$(REMOVECOMMAND) *.16B
 	@$(REMOVECOMMAND) *.OBJ
-	@$(REMOVECOMMAND) *.o
+	@$(REMOVECOMMAND) *.$(OBJ)
 	@$(REMOVECOMMAND) *.BCO
-	@$(REMOVECOMMAND) makefi~1
-	@$(REMOVECOMMAND) makefile~
+	#@$(REMOVECOMMAND) makefi~1
+	#@$(REMOVECOMMAND) makefile~
 	@$(REMOVECOMMAND) __wcl__.LNK
 #	@$(REMOVECOMMAND) *.smp
 	@$(REMOVECOMMAND) *.SMP
@@ -450,22 +453,23 @@ backupconfig: .symbolic
 	@$(COPYCOMMAND) .gitignore git_igno.re
 
 comp: .symbolic
-	@upx -9 $(EXEC)
+	@$(UPX) -9 $(EXEC)
 
 comq: .symbolic
-	@upx -9 $(UPXQ) $(EXEC)
+	@$(UPX) -9 $(UPXQ) $(EXEC)
 
 www: .symbolic
-	@ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*'
-	@rm -f /var/www/$(EXEC)*
-	#@rm -f /var/www/*.exe.zip*
+	@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)
+	*x4get.bat $(EXEC)
 
 vomitchan: .symbolic
 	@$(DUMP) *.err
@@ -508,6 +512,7 @@ initlibs: .symbolic
 	@git clone https://github.com/id-Software/wolf3d.git
 	@git clone https://github.com/keendreams/keen.git
 	@cd $(PDIR)
+	@cp $(SRCLIB)doslib/make-lowercase .
 
 ##
 ##	experimental libs