Merge remote-tracking branch 'upstream/master'

diff --git a/.gitignore b/.gitignore
index 107b0e0..3f07a93 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,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/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 d6cc76f..a9583f1 100755 (executable)
--- 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)