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

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

9c4c3a9e080f3e58986d030072eaf5cd9e5aa9e9
diff --combined makefile
index ac76ae2a,d63d5080..cf5e2cbe
--- 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)
@@@ -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