From: Jonathan Campbell <jonathan@castus.tv>
Date: Fri, 25 Mar 2016 02:45:20 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=beac91fafbba029b3f8071904a5767ec21073342;hp=-c;p=16.git

Merge remote-tracking branch 'upstream/master'
---

beac91fafbba029b3f8071904a5767ec21073342
diff --combined makefile
index f035f1c5,1f4a3e50..ac76ae2a
--- a/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