From: Jonathan Campbell <jonathan@castus.tv>
Date: Fri, 18 Mar 2016 10:44:13 +0000 (-0700)
Subject: cleanup, get working, linking to DOSLIB, also build step to make
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=387784a755423bdeeaa1ad3a4178a009dfbb6687;p=16.git

cleanup, get working, linking to DOSLIB, also build step to make
PCX2VRL sprite compiler, makefile step to produce test VRL+PAL
combination for TESUTO.EXE, and DOS batch file to show how to see
sample VRL.
---

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/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 8d1771e3..3aeb7643 100755
--- a/makefile
+++ b/makefile
@@ -75,6 +75,7 @@ CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##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)
@@ -92,7 +93,17 @@ EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe
 
 !include $(DOSLIBDIR)/extdep.mak
 
-all: $(EXEC)
+all: $(EXEC) datatest
+
+cute.vrl: data/cute.pcx $(PCX2VRL)
+	$(PCX2VRL) -i data/cute.pcx -o cute.vrl -p cute.pal -tc 254
+	# you can then test this against TESUTO.EXE by typing: TESUTO CUTE.VRL CUTE.PAL
+
+datatest: cute.vrl .symbolic
+
+# doslib PCX to VRL converter native host binary
+$(PCX2VRL): $(DOSLIBDIR)/hw/vga/pcx2vrl.c
+	cd $(DOSLIBDIR)/hw/vga && make pcx2vrl
 
 #$(16LIBOBJS) => 16.lib bug....
 
@@ -121,7 +132,7 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ)
 #	@wlink @tmp.cmd
 	wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ)
 tesuto.$(OBJ): $(SRC)tesuto.c
-	wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c
+	wcl $(FLAGS) $(DOSLIB_CINCLUDE) $(WCLQ) -c $(SRC)tesuto.c
 #tesuto.exe: tesuto.$(OBJ)
 #	wcl $(WCLQ) -mh -d2 tesuto.$(OBJ)
 #tesuto.$(OBJ): $(SRC)tesuto.c
@@ -300,13 +311,16 @@ vgmsnd.lib: $(VGMSNDOBJ)
 
 # library deps 16-bit huge
 dl_vga.lib:
-	cd $(DOSLIBDIR)/hw/vga/dos86h && ./make.sh
+	cd $(DOSLIBDIR)/hw/vga && ./make.sh
+	cp $(DOSLIBDIR)/hw/vga/dos86h/vga.lib dl_vga.lib
 
 dl_cpu.lib:
-	cd $(DOSLIBDIR)/hw/cpu/dos86h && ./make.sh
+	cd $(DOSLIBDIR)/hw/cpu && ./make.sh
+	cp $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib dl_cpu.lib
 
 dl_dos.lib:
-	cd $(DOSLIBDIR)/hw/dos/dos86h && ./make.sh
+	cd $(DOSLIBDIR)/hw/dos && ./make.sh
+	cp $(DOSLIBDIR)/hw/dos/dos86h/dos.lib dl_dos.lib
 
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
 	wcl $(FLAGS) -c $(SRCLIB)modex16.c
diff --git a/src/lib/doslib b/src/lib/doslib
index 36710d8b..43602004 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 36710d8b91d259ed353e537c17a387e737924469
+Subproject commit 43602004dc8f1a027ec186d3bf87a808c40083f5
diff --git a/src/tesuto.h b/src/tesuto.h
index e2bdeae7..8703081d 100755
--- a/src/tesuto.h
+++ b/src/tesuto.h
@@ -7,9 +7,9 @@
 #include "src/lib/doslib/hw/dos/dos.h"
 
 
-typedef unsigned char far *VGA_RAM_PTR;
-VGA_RAM_PTR vga_graphics_ram = (VGA_RAM_PTR)MK_FP(0xA000,0x0000);
-unsigned char vga_stride = 80; // 80 x 4 = 320 for 320-pixel wide modes
+//typedef unsigned char far *VGA_RAM_PTR;
+//VGA_RAM_PTR vga_graphics_ram = (VGA_RAM_PTR)MK_FP(0xA000,0x0000);
+//unsigned char vga_stride = 80; // 80 x 4 = 320 for 320-pixel wide modes
 
 /*static inline void vga_write_sequencer(unsigned char i,unsigned char c) {
     outp(0x3C4,i);