Merge remote-tracking branch 'upstream/master'

diff --cc makefile
index f1f1e80872a9a795a3b8d93c9977b78b382dd6fd,11566929272b9972f22c0f9b3582c9b2a74f4e8b..4eebe67b5e3fe066db2d5c7316d0bb1d9e15c5ce
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -130,9 -116,9 +117,9 @@@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS
  #     %write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib
  #     %write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.lib
  #     @wlink @tmp.cmd
-       wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ)
+       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) $(DOSLIB_CINCLUDE) $(WCLQ) -c $(SRC)tesuto.c
  #tesuto.exe: tesuto.$(OBJ)
  #     wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
  #tesuto.$(OBJ): $(SRC)tesuto.c