Merge remote-tracking branch 'upstream/master'

diff --combined makefile
index f035f1c5ba4aef20783d3966e028c65ba2668205,1f4a3e5055d5214f265ed4e55bb6a05664dc8b49..ac76ae2ab3a641d9f2067eca186397b0aed4597f
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -75,7 -75,6 +75,7 @@@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -w
  OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87  -onac -ol+ -ok####x
  FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS)
  
 +PCX2VRL=$(DOSLIBDIR)/hw/vga/pcx2vrl
  
  DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
  VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
@@@ -89,7 -88,7 +89,7 @@@ DOSLIBLIBS=$(DOSLIBDIR)/hw/cpu/dos86h/c
  TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe
  # tsthimem.exe
  #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
- EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
+ EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe drawvrl5.exe
  
  all: $(EXEC)
  
@@@ -119,7 -118,12 +119,12 @@@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS
  #     @wlink @tmp.cmd
        wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
  tesuto.$(OBJ): $(SRC)tesuto.c
-       wcl $(FLAGS) $(DOSLIB_CINCLUDE) $(WCLQ) -c $(SRC)tesuto.c
+       wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+ 
+ drawvrl5.exe: drawvrl5.$(OBJ) $(DOSLIBLIBS)
+       wcl $(FLAGS) $(WCLQ) drawvrl5.$(OBJ) $(DOSLIBLIBS)
+ drawvrl5.$(OBJ): $(SRC)drawvrl5.c
+       wcl $(FLAGS) $(WCLQ) -c $(SRC)drawvrl5.c
  #tesuto.exe: tesuto.$(OBJ)
  #     wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
  #tesuto.$(OBJ): $(SRC)tesuto.c