Merge remote-tracking branch 'upstream/master'

diff --git a/.gitignore b/.gitignore
index 7345f26390b9862ed40acb935c2c290b35350814..aa3c9906a6f90b711312ea0625ce7f37d24dbe18 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,8 @@ img
 #!foo.html\r
 # Ignore objects and archives.\r
 *.[oa]\r
-\r
+cute.vrl\r
+cute.pal\r
+dl_vga.lib\r
+dl_cpu.lib\r
+dl_dos.lib\r

diff --git a/16/doslib b/16/doslib
deleted file mode 160000 (submodule)
index 9756904..0000000
--- a/16/doslib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 975690444b74e8f28ad288412c0b0c754fab2342

diff --git a/cutetest.bat b/cutetest.bat
new file mode 100644 (file)
index 0000000..efaf91d
--- /dev/null
+++ b/cutetest.bat
@@ -0,0 +1,3 @@
+@echo off
+tesuto cute.vrl cute.pal
+

diff --git a/makefile b/makefile
index 3de9313ee78bfa1d56bf2551b98107437b690481..af0fa557811f3eec1400bcff246403e5d9735e6e 100755 (executable)
--- 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)