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=beac91fafbba029b3f8071904a5767ec21073342;p=16.git

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

diff --git a/makefile b/makefile
index ac76ae2a..cf5e2cbe 100755
--- a/makefile
+++ b/makefile
@@ -121,10 +121,10 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib
 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