Merge remote-tracking branch 'upstream/master'

diff --combined makefile
index ac76ae2ab3a641d9f2067eca186397b0aed4597f,d63d5080d2ba03b05ce1a6463857b68ca3371b61..cf5e2cbe148ce3c40f0bf14a42ba4ee8d37d5dfe
--- 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)
@@@ -121,10 -120,10 +121,10 @@@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS
  tesuto.$(OBJ): $(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
+ drawvrl5.exe: .symbolic
+       #@cd $(DOSLIB)hw/vga/make.
+       @wmake $(DOSLIBDIR)/hw/vga/dos86h/vga.lib
+       @$(COPYCOMMAND) $(DOSLIBDIR)/hw/vga/dos86h/drawvrl5.exe ./
  #tesuto.exe: tesuto.$(OBJ)
  #     wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
  #tesuto.$(OBJ): $(SRC)tesuto.c