Merge remote-tracking branch 'upstream/master'

diff --combined makefile
index c156f741e9cc78e183783fb165f8c86234a909d5,8d94ab0f1f1dd27465aa27a66a43194ffc48371f..d77bf7c0a0a808fd74ff512bad362f257337a5f1
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -71,7 -71,6 +71,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)
@@@ -87,7 -86,7 +87,7 @@@ TESTEXEC = exmmtest.exe test.exe pcxtes
  #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe
  EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
  
- all: $(EXEC)
+ all: $(EXEC)  joytest.exe
  
  #$(16LIBOBJS) => 16.lib bug....
  #
@@@ -293,6 -292,8 +293,8 @@@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DI
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh
  $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib:
        cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh
+ joytest.exe:
+       cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe
  #$(DOSLIBLIBS): .symbolic
  #     @cd $(DOSLIB)
  #     @.$(DIRSEP)buildall.sh