From: Jonathan Campbell <jonathan@castus.tv>
Date: Fri, 27 May 2016 19:56:41 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=dd532df1ba5c28f9efe78c512052563086381e9b;hp=e05e5231944441a76f4b7cf66b98e8c7b74b3db9;p=16.git

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

diff --git a/.gitignore b/.gitignore
index 107b0e01..3f07a93e 100755
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,8 @@ img
 #!foo.html
 # Ignore objects and archives.
 *.[oa]
-
+cute.vrl
+cute.pal
+dl_vga.lib
+dl_cpu.lib
+dl_dos.lib
diff --git a/cutetest.bat b/cutetest.bat
new file mode 100644
index 00000000..efaf91d1
--- /dev/null
+++ b/cutetest.bat
@@ -0,0 +1,3 @@
+@echo off
+tesuto cute.vrl cute.pal
+
diff --git a/makefile b/makefile
index d6cc76f9..a9583f13 100755
--- a/makefile
+++ b/makefile
@@ -79,6 +79,7 @@ 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
 
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)