wwww
リビジョン | 46e42c89e37ff73a65cc8e2ab59a50c86d236142 (tree) |
---|---|
日時 | 2016-03-19 00:29:18 |
作者 | ![]() |
コミッター | sparky4 |
tesuto is vrl draw now ww
@@ -83,6 +83,8 @@ DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) | ||
83 | 83 | |
84 | 84 | GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) |
85 | 85 | |
86 | +DOSLIBLIBS=dl_vga.lib dl_cpu.lib dl_dos.lib | |
87 | + | |
86 | 88 | 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 |
87 | 89 | # tsthimem.exe |
88 | 90 | #testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe |
@@ -112,12 +114,12 @@ scroll.$(OBJ): $(SRC)scroll.c | ||
112 | 114 | |
113 | 115 | |
114 | 116 | # NOTE: dos86h = 16-bit huge memory model. memory model must match! |
115 | -tesuto.exe: tesuto.$(OBJ) dl_vga.lib 16_head.$(OBJ) | |
117 | +tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) | |
116 | 118 | # %write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe |
117 | 119 | # %write tmp.cmd library $(DOSLIBDIR)/hw/cpu/dos86h/cpu.lib |
118 | 120 | # %write tmp.cmd library $(DOSLIBDIR)/hw/dos/dos86h/dos.lib |
119 | 121 | # @wlink @tmp.cmd |
120 | - wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) dl_vga.lib 16_head.$(OBJ) | |
122 | + wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) | |
121 | 123 | tesuto.$(OBJ): $(SRC)tesuto.c |
122 | 124 | wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c |
123 | 125 | #tesuto.exe: tesuto.$(OBJ) |
@@ -300,6 +302,12 @@ vgmsnd.lib: $(VGMSNDOBJ) | ||
300 | 302 | dl_vga.lib: |
301 | 303 | cd $(DOSLIBDIR)/hw/vga/dos86h && ./make.sh |
302 | 304 | |
305 | +dl_cpu.lib: | |
306 | + cd $(DOSLIBDIR)/hw/cpu/dos86h && ./make.sh | |
307 | + | |
308 | +dl_dos.lib: | |
309 | + cd $(DOSLIBDIR)/hw/dos/dos86h && ./make.sh | |
310 | + | |
303 | 311 | modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c |
304 | 312 | wcl $(FLAGS) -c $(SRCLIB)modex16.c |
305 | 313 |
@@ -413,13 +421,13 @@ clean: .symbolic | ||
413 | 421 | @$(REMOVECOMMAND) *.$(OBJ) |
414 | 422 | @$(REMOVECOMMAND) 16.lib |
415 | 423 | @$(REMOVECOMMAND) gfx.lib |
416 | - @$(REMOVECOMMAND) doslib.lib | |
417 | 424 | @$(REMOVECOMMAND) vgmsnd.lib |
418 | - @$(REMOVECOMMAND) dl_vga.lib | |
425 | + @$(REMOVECOMMAND) $(DOSLIBLIBS) | |
419 | 426 | @wlib -n $(WLIBQ) 16.lib |
420 | 427 | @wlib -n $(WLIBQ) gfx.lib |
421 | - @wlib -n $(WLIBQ) doslib.lib | |
422 | 428 | @wlib -n $(WLIBQ) vgmsnd.lib |
429 | + @wlib -n $(WLIBQ) dl_cpu.lib | |
430 | + @wlib -n $(WLIBQ) dl_dos.lib | |
423 | 431 | @wlib -n $(WLIBQ) dl_vga.lib |
424 | 432 | @$(REMOVECOMMAND) *.16 |
425 | 433 | @$(REMOVECOMMAND) *.16W |
@@ -3,13 +3,15 @@ | ||
3 | 3 | |
4 | 4 | #include "src/lib/16_head.h" |
5 | 5 | #include "src/lib/doslib/hw/vga/vga.h" |
6 | +#include "src/lib/doslib/hw/dos/dos.h" | |
7 | +#include "src/lib/doslib/hw/cpu/cpu.h" | |
6 | 8 | |
7 | 9 | typedef unsigned char far *VGA_RAM_PTR; |
8 | 10 | VGA_RAM_PTR vga_graphics_ram = (VGA_RAM_PTR)MK_FP(0xA000,0x0000); |
9 | 11 | unsigned char vga_stride = 80; // 80 x 4 = 320 for 320-pixel wide modes |
10 | 12 | |
11 | -static inline void vga_write_sequencer(unsigned char i,unsigned char c) { | |
13 | +/*static inline void vga_write_sequencer(unsigned char i,unsigned char c) { | |
12 | 14 | outp(0x3C4,i); |
13 | 15 | outp(0x3C5,c); |
14 | -} | |
16 | +}*/ | |
15 | 17 | #endif |