From: Jonathan Campbell <jonathan@castus.tv>
Date: Mon, 4 Apr 2016 06:47:21 +0000 (-0700)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=d71e4ebbd3770b48eee2b2cc18288b97aad4e1e4;hp=3518b6b4a81ba2369bb95c9a9b387e799c1c3692;p=16.git

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

diff --git a/.gitignore b/.gitignore
index 7345f263..aa3c9906 100755
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,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/16/doslib b/16/doslib
deleted file mode 160000
index 97569044..00000000
--- a/16/doslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342
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 3de9313e..af0fa557 100755
--- a/makefile
+++ b/makefile
@@ -71,6 +71,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
 
 #DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ)
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)