exmm wwww

Signed-off-by: sparky4 <sparky4@cock.li>

diff --git a/16.LIB b/16.LIB
index 6967e3b4d421110c7ba8d9243b7c6f042680c259..523265fe9a5ee6712a12e09db3c7ab1da448c0f7 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

diff --git a/16.exe b/16.exe
index 43d3b6dd4bc13e3d58370bf747be460b8e17fef8..7c2c48b7a654ee486b506760b8c7cd2a130c8416 100644 (file)
Binary files a/16.exe and b/16.exe differ

diff --git a/GFX.LIB b/GFX.LIB
index 628f961b6d155724a60e7f1fb64fa0b632b23142..1e340935ae68ec5c3d486646cf87a4cd8e6bf904 100644 (file)
Binary files a/GFX.LIB and b/GFX.LIB differ

diff --git a/exmmtest.exe b/exmmtest.exe
index ac09f6b42d28066cd10af0caa701048640ebcc8d..3bd7d73b962df3cbf3e8a054f45d50aa54d885e5 100644 (file)
Binary files a/exmmtest.exe and b/exmmtest.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 168bbaa87e14e1493a794b4e449cee3a6b3b7577..9fd9ea35b94dc4d9a31c02e6221c5f8e3ad02b35 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/inputest.exe b/inputest.exe
index c7826587bc31c554e0b79664f54f0f5b3717e5b3..97ba47cdcff5aa05fbb004dc476011f5d49832a9 100644 (file)
Binary files a/inputest.exe and b/inputest.exe differ

diff --git a/makefile b/makefile
index d49ccf9e743813405f6c37773de92eea2c8724ec..0562cef2cb158748000713b89e698dda19c6abc1 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,176 +1,176 @@
-#-zk0u = translate kanji to unicode... wwww\r
-#-zk0 = kanji support~\r
-#-zkl = current codepage\r
-\r
-MFLAGS=-mh# -zm\r
-CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq\r
-OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+\r
-FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)\r
-REMOVECOMMAND=del\r
-DIRSEP=\\r
-OBJ=obj\r
-SRC=src$(DIRSEP)\r
-SRCLIB=$(SRC)lib$(DIRSEP)\r
-JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)\r
-EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
-WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
-\r
-16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)\r
-GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)\r
-\r
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe\r
-\r
-#\r
-#executables\r
-#\r
-16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-       wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-\r
-scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
-       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
-scroll.$(OBJ): $(SRC)scroll.c\r
-       wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.$(OBJ) 16.lib\r
-       wcl $(FLAGS) test.$(OBJ) 16.lib\r
-\r
-test2.exe: test2.$(OBJ) 16.lib\r
-       wcl $(FLAGS) test2.$(OBJ) 16.lib\r
-\r
-fonttest.exe: fonttest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) fonttest.$(OBJ) 16.lib\r
-\r
-inputest.exe: inputest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
-\r
-pcxtest.exe: pcxtest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
-\r
-palettec.exe: palettec.$(OBJ) modex16.$(OBJ)\r
-       wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
-\r
-maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-\r
-maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
-\r
-emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
-\r
-emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)\r
-\r
-fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
-\r
-exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)\r
-        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)\r
-\r
-#\r
-#executable's objects\r
-#\r
-16.$(OBJ): $(SRC)16.h $(SRC)16.c\r
-       wcl $(FLAGS) -c $(SRC)16.c\r
-\r
-test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)test.c\r
-\r
-test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)test2.c\r
-\r
-pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)pcxtest.c\r
-\r
-palettec.$(OBJ): $(SRC)palettec.c\r
-       wcl $(FLAGS) -c $(SRC)palettec.c\r
-\r
-maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)maptest.c\r
-\r
-maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
-\r
-emmtest.$(OBJ): $(SRC)emmtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
-\r
-emsdump.$(OBJ): $(SRC)emsdump.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
-\r
-fmemtest.$(OBJ): $(SRC)fmemtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
-\r
-fonttest.$(OBJ): $(SRC)fonttest.c\r
-       wcl -c $(SRC)fonttest.c\r
-\r
-inputest.$(OBJ): $(SRC)inputest.c\r
-       wcl $(FLAGS) -c $(SRC)inputest.c\r
-\r
-exmmtest.$(OBJ): $(SRC)exmmtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c\r
-\r
-#\r
-#non executable objects libraries\r
-#\r
-16.lib: $(16LIBOBJS) gfx.lib\r
-       wlib -b 16.lib $(16LIBOBJS) gfx.lib\r
-\r
-gfx.lib: $(GFXLIBOBJS)\r
-       wlib -b gfx.lib $(GFXLIBOBJS)\r
-\r
-modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
-       wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
-\r
-dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
-       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
-\r
-bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
-       wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
-\r
-planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c\r
-       wcl $(FLAGS) -c $(SRCLIB)planar.c\r
-\r
-scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
-       wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
-\r
-wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
-       wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
-\r
-16text.$(OBJ): $(SRCLIB)16text.c\r
-       wcl -c $(SRCLIB)16text.c\r
-\r
-mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
-\r
-fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
-\r
-16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c\r
-       wcl $(FLAGS) -c $(SRCLIB)16_in.c\r
-\r
-16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)16_mm.c\r
-\r
-lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
-       wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
-\r
-jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
-       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
-\r
-farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
-\r
-memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
-\r
-#\r
-#other~\r
-#\r
-clean: .symbolic\r
-#      @$(REMOVECOMMAND) *.$(OBJ)\r
-       @$(REMOVECOMMAND) *.OBJ\r
-#      @$(REMOVECOMMAND) *.out\r
-#      @$(REMOVECOMMAND) *.OUT\r
-       @$(REMOVECOMMAND) makefi~1\r
-       @$(REMOVECOMMAND) __WCL__.LNK\r
-#      @$(REMOVECOMMAND) *.smp\r
-       @$(REMOVECOMMAND) *.SMP\r
+#-zk0u = translate kanji to unicode... wwww
+#-zk0 = kanji support~
+#-zkl = current codepage
+
+MFLAGS=-mh# -zm
+CFLAGS=-zkl -wo -x#### -mc# -zdp# -zp16 -zq
+OFLAGS=-ot -ox -ob -oh -or# -om -ol -ol+
+FLAGS=-0 -d2 -lr $(OFLAGS) $(CFLAGS)
+REMOVECOMMAND=del
+DIRSEP=\
+OBJ=obj
+SRC=src$(DIRSEP)
+SRCLIB=$(SRC)lib$(DIRSEP)
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
+
+16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
+
+all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe fonttest.exe inputest.exe exmmtest.exe
+
+#
+#executables
+#
+16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+       wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+
+scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
+       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)
+scroll.$(OBJ): $(SRC)scroll.c
+       wcl $(FLAGS) -c $(SRC)scroll.c
+test.exe: test.$(OBJ) 16.lib
+       wcl $(FLAGS) test.$(OBJ) 16.lib
+
+test2.exe: test2.$(OBJ) 16.lib
+       wcl $(FLAGS) test2.$(OBJ) 16.lib
+
+fonttest.exe: fonttest.$(OBJ) 16.lib
+       wcl $(FLAGS) fonttest.$(OBJ) 16.lib
+
+inputest.exe: inputest.$(OBJ) 16.lib
+       wcl $(FLAGS) inputest.$(OBJ) 16.lib
+
+pcxtest.exe: pcxtest.$(OBJ) 16.lib
+       wcl $(FLAGS) pcxtest.$(OBJ) 16.lib
+
+palettec.exe: palettec.$(OBJ) modex16.$(OBJ)
+       wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)
+
+maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib
+
+maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
+       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib
+
+emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)
+       wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)
+
+emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)
+       wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)
+
+fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)
+       wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)
+
+exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
+        wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)
+
+#
+#executable's objects
+#
+16.$(OBJ): $(SRC)16.h $(SRC)16.c
+       wcl $(FLAGS) -c $(SRC)16.c
+
+test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)test.c
+
+test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)test2.c
+
+pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)pcxtest.c
+
+palettec.$(OBJ): $(SRC)palettec.c
+       wcl $(FLAGS) -c $(SRC)palettec.c
+
+maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h
+       wcl $(FLAGS) -c $(SRC)maptest.c
+
+maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c
+
+emmtest.$(OBJ): $(SRC)emmtest.c
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c
+
+emsdump.$(OBJ): $(SRC)emsdump.c
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c
+
+fmemtest.$(OBJ): $(SRC)fmemtest.c
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c
+
+fonttest.$(OBJ): $(SRC)fonttest.c
+       wcl -c $(SRC)fonttest.c
+
+inputest.$(OBJ): $(SRC)inputest.c
+       wcl $(FLAGS) -c $(SRC)inputest.c
+
+exmmtest.$(OBJ): $(SRC)exmmtest.c
+       wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c
+
+#
+#non executable objects libraries
+#
+16.lib: $(16LIBOBJS) gfx.lib
+       wlib -b 16.lib $(16LIBOBJS) gfx.lib
+
+gfx.lib: $(GFXLIBOBJS)
+       wlib -b gfx.lib $(GFXLIBOBJS)
+
+modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c
+       wcl $(FLAGS) -c $(SRCLIB)modex16.c
+
+dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c
+       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c
+
+bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c
+       wcl $(FLAGS) -c $(SRCLIB)bitmap.c
+
+planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c
+       wcl $(FLAGS) -c $(SRCLIB)planar.c
+
+scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
+       wcl $(FLAGS) -c $(SRCLIB)scroll16.c
+
+wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c
+       wcl $(FLAGS) -c $(WCPULIB)wcpu.c
+
+16text.$(OBJ): $(SRCLIB)16text.c
+       wcl -c $(SRCLIB)16text.c
+
+mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+
+fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib
+
+16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c
+       wcl $(FLAGS) -c $(SRCLIB)16_in.c
+
+16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)16_mm.c
+
+lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c
+       wcl $(FLAGS) -c $(SRCLIB)lib_head.c
+
+jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c
+       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c
+
+farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c
+       wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c
+
+memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c
+       wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c
+
+#
+#other~
+#
+clean: .symbolic
+#      @$(REMOVECOMMAND) *.$(OBJ)
+       @$(REMOVECOMMAND) *.OBJ
+#      @$(REMOVECOMMAND) *.out
+#      @$(REMOVECOMMAND) *.OUT
+       @$(REMOVECOMMAND) makefi~1
+       @$(REMOVECOMMAND) __WCL__.LNK
+#      @$(REMOVECOMMAND) *.smp
+       @$(REMOVECOMMAND) *.SMP

diff --git a/makefile.gnu b/makefile.gnu
index 1743f4665e5f8fd469b8707af160e513e7ba4ee4..f86934a9f6a6f2e0bc6d2cfd9968e386e81d9739 100644 (file)
--- a/makefile.gnu
+++ b/makefile.gnu
@@ -24,44 +24,44 @@ all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe m
 #executables\r
 #\r
 16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-       wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+        wcl $(FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
 \r
 scroll.exe: scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
-       wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
+        wcl $(FLAGS) scroll.$(OBJ) 16.lib mapread.$(OBJ) jsmn.$(OBJ) dos_kb.$(OBJ)\r
 scroll.$(OBJ): $(SRC)scroll.c\r
-       wcl $(FLAGS) -c $(SRC)scroll.c\r
+        wcl $(FLAGS) -c $(SRC)scroll.c\r
 test.exe: test.$(OBJ) 16.lib\r
-       wcl $(FLAGS) test.$(OBJ) 16.lib\r
+        wcl $(FLAGS) test.$(OBJ) 16.lib\r
 \r
 test2.exe: test2.$(OBJ) 16.lib\r
-       wcl $(FLAGS) test2.$(OBJ) 16.lib\r
+        wcl $(FLAGS) test2.$(OBJ) 16.lib\r
 \r
 fonttest.exe: fonttest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) fonttest.$(OBJ) 16.lib\r
+        wcl $(FLAGS) fonttest.$(OBJ) 16.lib\r
 \r
 inputest.exe: inputest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
+        wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
 \r
 pcxtest.exe: pcxtest.$(OBJ) 16.lib\r
-       wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
+        wcl $(FLAGS) pcxtest.$(OBJ) 16.lib\r
 \r
 palettec.exe: palettec.$(OBJ) modex16.$(OBJ)\r
-       wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
+        wcl $(FLAGS) palettec.$(OBJ) modex16.$(OBJ)\r
 \r
 maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
-       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
+        wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) 16.lib\r
 \r
 maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
+        wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# 16.lib\r
 \r
 emmtest.exe: emmtest.$(OBJ) memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
+        wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ)\r
 \r
 emsdump.exe: emsdump.$(OBJ) memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)\r
+        wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ)\r
 \r
 fmemtest.exe: fmemtest.$(OBJ)# memory.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
+        wcl $(FLAGS) $(MFLAGS) fmemtest.$(OBJ)# memory.$(OBJ)\r
 \r
 exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)\r
         wcl $(FLAGS) $(MFLAGS) exmmtest.$(OBJ) 16_mm.$(OBJ)\r
@@ -70,107 +70,107 @@ exmmtest.exe: exmmtest.$(OBJ) 16_mm.$(OBJ)
 #executable's objects\r
 #\r
 16.$(OBJ): $(SRC)16.h $(SRC)16.c\r
-       wcl $(FLAGS) -c $(SRC)16.c\r
+        wcl $(FLAGS) -c $(SRC)16.c\r
 \r
 test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)test.c\r
+        wcl $(FLAGS) -c $(SRC)test.c\r
 \r
 test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)test2.c\r
+        wcl $(FLAGS) -c $(SRC)test2.c\r
 \r
 pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)pcxtest.c\r
+        wcl $(FLAGS) -c $(SRC)pcxtest.c\r
 \r
 palettec.$(OBJ): $(SRC)palettec.c\r
-       wcl $(FLAGS) -c $(SRC)palettec.c\r
+        wcl $(FLAGS) -c $(SRC)palettec.c\r
 \r
 maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) -c $(SRC)maptest.c\r
+        wcl $(FLAGS) -c $(SRC)maptest.c\r
 \r
 maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c\r
 \r
 emmtest.$(OBJ): $(SRC)emmtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c\r
 \r
 emsdump.$(OBJ): $(SRC)emsdump.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRC)emsdump.c\r
 \r
 fmemtest.$(OBJ): $(SRC)fmemtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRC)fmemtest.c\r
 \r
 fonttest.$(OBJ): $(SRC)fonttest.c\r
-       wcl -c $(SRC)fonttest.c\r
+        wcl -c $(SRC)fonttest.c\r
 \r
 inputest.$(OBJ): $(SRC)inputest.c\r
-       wcl $(FLAGS) -c $(SRC)inputest.c\r
+        wcl $(FLAGS) -c $(SRC)inputest.c\r
 \r
 exmmtest.$(OBJ): $(SRC)exmmtest.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRC)exmmtest.c\r
 \r
 #\r
 #non executable objects libraries\r
 #\r
 16.lib: $(16LIBOBJS) gfx.lib\r
-       wlib -b 16.lib $(16LIBOBJS) gfx.lib\r
+        wlib -b 16.lib $(16LIBOBJS) gfx.lib\r
 \r
 gfx.lib: $(GFXLIBOBJS)\r
-       wlib -b gfx.lib $(GFXLIBOBJS)\r
+        wlib -b gfx.lib $(GFXLIBOBJS)\r
 \r
 modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
-       wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
+        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
 dos_kb.$(OBJ): $(SRCLIB)dos_kb.h $(SRCLIB)dos_kb.c\r
-       wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
+        wcl $(FLAGS) -c $(SRCLIB)dos_kb.c\r
 \r
 bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c\r
-       wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
+        wcl $(FLAGS) -c $(SRCLIB)bitmap.c\r
 \r
 planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c\r
-       wcl $(FLAGS) -c $(SRCLIB)planar.c\r
+        wcl $(FLAGS) -c $(SRCLIB)planar.c\r
 \r
 scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c\r
-       wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
+        wcl $(FLAGS) -c $(SRCLIB)scroll16.c\r
 \r
 wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
-       wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
+        wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
 \r
 16text.$(OBJ): $(SRCLIB)16text.c\r
-       wcl -c $(SRCLIB)16text.c\r
+        wcl -c $(SRCLIB)16text.c\r
 \r
 mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
+        wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib\r
 \r
 fmapread.$(OBJ): $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
 \r
 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c\r
-       wcl $(FLAGS) -c $(SRCLIB)16_in.c\r
+        wcl $(FLAGS) -c $(SRCLIB)16_in.c\r
 \r
 16_mm.$(OBJ): $(SRCLIB)16_mm.h $(SRCLIB)16_mm.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)16_mm.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)16_mm.c\r
 \r
 lib_head.$(OBJ): $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
-       wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
+        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r
 \r
 jsmn.$(OBJ): $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c\r
-       wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
+        wcl $(FLAGS) -c $(JSMNLIB)jsmn.c\r
 \r
 farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c\r
 \r
 memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
+        wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c\r
 \r
 #\r
 #other~\r
 #\r
 clean: .symbolic\r
-#      @$(REMOVECOMMAND) *.$(OBJ)\r
-       @$(REMOVECOMMAND) *.OBJ\r
-#      @$(REMOVECOMMAND) *.out\r
-#      @$(REMOVECOMMAND) *.OUT\r
-       @$(REMOVECOMMAND) makefi~1\r
-       @$(REMOVECOMMAND) __WCL__.LNK\r
-#      @$(REMOVECOMMAND) *.smp\r
-       @$(REMOVECOMMAND) *.SMP\r
+#       @$(REMOVECOMMAND) *.$(OBJ)\r
+        @$(REMOVECOMMAND) *.OBJ\r
+#       @$(REMOVECOMMAND) *.out\r
+#       @$(REMOVECOMMAND) *.OUT\r
+        @$(REMOVECOMMAND) makefi~1\r
+        @$(REMOVECOMMAND) __WCL__.LNK\r
+#       @$(REMOVECOMMAND) *.smp\r
+        @$(REMOVECOMMAND) *.SMP\r

diff --git a/maptest.exe b/maptest.exe
index a846d026d0ebabe50ae22b7f328f0203b2abe9ae..2a6a6dd586b122fa01a6e73e6dc7518a1ae84076 100644 (file)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/maptest0.exe b/maptest0.exe
index 815756c681a1fa6b78dfce761fef435d8bb79a36..12dda10af0a71a06f5231f54b149f09a71ea8e76 100644 (file)
Binary files a/maptest0.exe and b/maptest0.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 80badb00b632c1dd65e07c6b549e1af10c23c225..57294369fb8d0b5ca2bdecabd2374b6b01e80ab8 100644 (file)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/scroll.exe b/scroll.exe
index 89e5c6b93f86917088d2eae3e50ad4aa037ab4be..4180b96fc72ba35d9bba12521956c9e26b649922 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/16_mm.c b/src/lib/16_mm.c
index c3230f9b797d81a540a51ebada58c3a4dd0f64af..88f690d1582811a3a45cc1f656187c83ece74d6b 100644 (file)
--- a/src/lib/16_mm.c
+++ b/src/lib/16_mm.c
@@ -1036,6 +1036,7 @@ dword MM_UnusedMemory (void)
        }\r
 \r
        return free*16l;\r
+//     return free;\r
 }\r
 \r
 //==========================================================================\r
@@ -1068,6 +1069,7 @@ dword MM_TotalFree (void)
        }\r
 \r
        return free*16l;\r
+//     return free;\r
 }\r
 \r
 //==========================================================================\r
@@ -1093,6 +1095,9 @@ void MM_Report(void)
        printf("mainmem=%lu\n", mminfo.mainmem);\r
        printf("UnusedMemory=%lu\n", MM_UnusedMemory());\r
        printf("TotalFree=%lu\n", MM_TotalFree());\r
+       printf("\n");\r
+       printf("UnusedMemory=%lu kb\n", MM_UnusedMemory()/10248);\r
+       printf("TotalFree=%lu kb\n", MM_TotalFree()/10248);\r
 }\r
 \r
 //==========================================================================\r

diff --git a/src/lib/16_mm.h b/src/lib/16_mm.h
index 102c406ca4dd7c3fa5bbb166bb6ce1f1c70a48f2..f2b41c2cbbdacfef91ee2c9bfbcf18dd1cde26df 100644 (file)
--- a/src/lib/16_mm.h
+++ b/src/lib/16_mm.h
@@ -79,8 +79,8 @@
 #define        XMS_FREEUMB             0x11
 
 //==========================================================================
-
-typedef void /*__seg*/ * memptr;
+__segment                seg;
+typedef void __based(seg) * memptr;
 
 typedef struct
 {

diff --git a/test.exe b/test.exe
index c5c68fdb5e3edbfb2763e0acad280055ede3e296..262cd0229d6bdd75e63b36b5913fea8142c79a6b 100644 (file)
Binary files a/test.exe and b/test.exe differ

diff --git a/test2.exe b/test2.exe
index 0b07453824bc80c9c9ff05a103753fc4015d38ec..c9f12fc11ae1ea3a9364ce46b0cffccc666afd37 100644 (file)
Binary files a/test2.exe and b/test2.exe differ