Merge remote-tracking branch 'upstream/master'

diff --combined makefile
index 9da998721726f9f8cdfa147f2b5c809ce592721b,d8b5fd20b827b65f5ca462e2695741d1b8f2c12f..d29eb7c4cffad77c5c85d086ca5be7d9d96cd5ec
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -46,6 -46,8 +46,8 @@@ TARGET_OS = do
  #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP)
  PDIR=..$(DIRSEP)
  SRC=src$(DIRSEP)
+ DATADIR=data$(DIRSEP)
+ SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP)
  SRCLIB=$(SRC)lib$(DIRSEP)
  JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
  NYANLIB=$(SRCLIB)nyan$(DIRSEP)
@@@ -64,14 -66,13 +66,14 @@@ UPXQ=-qq
  AFLAGS=-mh -0 -d1
  16FLAGS=-fh=16.hed
  BAKAPIFLAGS=-fh=bakapi.hed
- SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k40000#55808#60000#32768
+ SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#55808#60000
  DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS)
  ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm
  CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww
  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 -88,7 +89,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)  joytest.exe
+ all: $(EXEC) joytest.exe vrs
  
  #$(16LIBOBJS) => 16.lib bug....
  #
@@@ -433,9 -434,9 +435,9 @@@ clean: .symboli
        @$(REMOVECOMMAND) *.MAP
        @$(REMOVECOMMAND) *.map
        @$(REMOVECOMMAND) *.err
-       @cd $(DOSLIB)
+       #@cd $(DOSLIB)
        #@./buildall.sh clean
-       @cd $(PDIR)$(PDIR)$(PDIR)
+       #@cd $(PDIR)$(PDIR)$(PDIR)
  #     @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
  #     @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
  #     @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@@ -517,3 -518,13 +519,13 @@@ mx_: .symboli
        @cd 16$(DIRSEP)xw_
        @wmake -h -f makefile all
        @cd $(PDIR)$(PDIR)
+ 
+ vrs: .symbolic
+       @cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga
+       #@make clean
+       @make all
+       @mv pcx2vrl ../../../../../
+       @mv pcxsscut ../../../../../
+       @mv vrl2vrs ../../../../../
+       @mv vrsdump ../../../../../
+       @cd ../../../../../