From 6ccf6cfeba7b61965a53eb87f821405bf2548c1d Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 21 Mar 2016 10:16:31 -0500 Subject: [PATCH] wwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww works now wwwww --- dl_cpu.bak | Bin 0 -> 1536 bytes dl_dos.bak | Bin 0 -> 1536 bytes dl_vga.bak | Bin 0 -> 1536 bytes makefile | 27 +++++++++++---------------- src/tesuto.h | 10 +++++----- 5 files changed, 16 insertions(+), 21 deletions(-) create mode 100755 dl_cpu.bak create mode 100755 dl_dos.bak create mode 100755 dl_vga.bak diff --git a/dl_cpu.bak b/dl_cpu.bak new file mode 100755 index 0000000000000000000000000000000000000000..aee7ace5ebc8adf7aec93a1d87194660a5b9a933 GIT binary patch literal 1536 ncmezHmyv;mfq{`>6pY9a_y~;uQ7{?;ctb!Kuk5Jg5DozVmPrHl literal 0 HcmV?d00001 diff --git a/dl_dos.bak b/dl_dos.bak new file mode 100755 index 0000000000000000000000000000000000000000..aee7ace5ebc8adf7aec93a1d87194660a5b9a933 GIT binary patch literal 1536 ncmezHmyv;mfq{`>6pY9a_y~;uQ7{?;ctb!Kuk5Jg5DozVmPrHl literal 0 HcmV?d00001 diff --git a/dl_vga.bak b/dl_vga.bak new file mode 100755 index 0000000000000000000000000000000000000000..aee7ace5ebc8adf7aec93a1d87194660a5b9a933 GIT binary patch literal 1536 ncmezHmyv;mfq{`>6pY9a_y~;uQ7{?;ctb!Kuk5Jg5DozVmPrHl literal 0 HcmV?d00001 diff --git a/makefile b/makefile index 856ebaa6..f53aeae0 100755 --- a/makefile +++ b/makefile @@ -61,6 +61,8 @@ DOSLIB=$(SRCLIB)doslib$(DIRSEP) DOSLIBDIR=$(SRCLIB)doslib WCPULIB=$(SRCLIB)wcpu$(DIRSEP) +!include $(DOSLIBDIR)/extdep.mak + WLIBQ=-q WCLQ=-zq $(WLIBQ) UPXQ=-qqq @@ -71,7 +73,7 @@ BAKAPIFLAGS=-fh=bakapi.hed SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm -CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww +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) @@ -83,7 +85,8 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) -DOSLIBLIBS=dl_vga.lib dl_cpu.lib dl_dos.lib +DOSLIBLIBS=$(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib $(DOSLIBDIR)/hw/dos/dos86h/dos.lib $(DOSLIBDIR)/hw/vga/dos86h/vga.lib +#dl_vga.lib dl_cpu.lib dl_dos.lib TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe # tsthimem.exe @@ -117,10 +120,8 @@ tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) # %write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib # %write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.lib # @wlink @tmp.cmd - !include $(DOSLIBDIR)/extdep.mak wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) tesuto.$(OBJ): $(SRC)tesuto.c - !include $(DOSLIBDIR)/extdep.mak wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c #tesuto.exe: tesuto.$(OBJ) # wcl $(WCLQ) -mh -d2 tesuto.$(OBJ) @@ -291,22 +292,17 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c gfx.lib: $(GFXLIBOBJS) wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) -doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib - wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib +#doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib +# wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib vgmsnd.lib: $(VGMSNDOBJ) wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ) - # library deps 16-bit huge -dl_vga.lib: - cd $(DOSLIBDIR)/hw/vga/dos86h && ./make.sh - -dl_cpu.lib: - cd $(DOSLIBDIR)/hw/cpu/dos86h && ./make.sh - -dl_dos.lib: - cd $(DOSLIBDIR)/hw/dos/dos86h && ./make.sh +$(DOSLIBLIBS): .symbolic + @cd $(DOSLIB) + @./buildall.sh + @cd $(PDIR)$(PDIR)$(PDIR) modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -481,7 +477,6 @@ updatelibs: .symbolic @cd $(PDIR)$(PDIR)$(PDIR) @cd $(DOSLIB) @git pull - !include $(DOSLIBDIR)/extdep.mak @./buildall.sh @cd $(PDIR)$(PDIR)$(PDIR) diff --git a/src/tesuto.h b/src/tesuto.h index e2bdeae7..994b6c9c 100755 --- a/src/tesuto.h +++ b/src/tesuto.h @@ -2,14 +2,14 @@ #define __TESUTO_H__ #include "src/lib/16_head.h" -#include "src/lib/doslib/hw/cpu/cpu.h" -#include "src/lib/doslib/hw/vga/vga.h" -#include "src/lib/doslib/hw/dos/dos.h" +#include +#include +#include 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 +//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); -- 2.39.5