wwww ok

	modified:   16.LIB
	modified:   16.exe
	new file:   GFX.LIB
	modified:   Project 16.bfproject
	modified:   fonttest.exe
modified:   inputest.exe
	modified:   makefile
	modified:   maptest.exe
	modified:   palettec.exe
	modified:   pcxtest.exe
	modified:   scroll.exe
	modified:   test.exe
	modified:   test2.exe

diff --git a/16.LIB b/16.LIB
index a7096a2a01577ca1efda7736920089b0ab4bc610..d273cb59f7a2bc5a7f15f6bb82c48a506257b27f 100644 (file)
Binary files a/16.LIB and b/16.LIB differ

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

diff --git a/GFX.LIB b/GFX.LIB
new file mode 100644 (file)
index 0000000..a23acc9
Binary files /dev/null and b/GFX.LIB differ

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 7c9223f3a0f0964cc3b43c366b6671f414b37a71..92551881813dc78b830a7c45997f2bfdef62f807 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -36,12 +36,12 @@ openfiles: /dos/z/16/src/lib/16_in.c:1522:1072:0:
 openfiles: /dos/z/16/src/lib/16_in.h:3692:3652:0:
 openfiles: /dos/z/16/src/lib/lib_head.c:3456:2616:0:
 openfiles: /dos/z/16/src/lib/lib_head.h:3332:2969:0:
-openfiles: /dos/z/16/makefile:1665:1084:0:
+openfiles: /dos/z/16/makefile:1235:295:1:
 openfiles: /dos/z/16/src/lib/types.h:1043:28:0:
 openfiles: /dos/z/16/src/16.h:943:0:0:
 openfiles: /dos/z/16/src/16.c:891:0:0:
 openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0:
-openfiles: /dos/z/16/src/lib/scroll16.c:0:0:1:
+openfiles: /dos/z/16/src/lib/scroll16.c:0:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -129,7 +129,7 @@ recent_files: file:///dos/z/16/src/inputest.c
 recent_files: file:///dos/z/16/src/lib/16_in.h
 recent_files: file:///dos/z/16/src/lib/16_in.c
 snr_replacetype: 0
-savedir: file:///dos/z/16/src/lib
+savedir: file:///dos/z/16
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 

diff --git a/fonttest.exe b/fonttest.exe
index c0d24493c8841a7632ebb7feaf6028c574323bc0..ac1cda24eccc76b367c40f952b9ff1be71e60801 100644 (file)
Binary files a/fonttest.exe and b/fonttest.exe differ

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

diff --git a/makefile b/makefile
index f551eca6caf0980a5c185228cd5c2b7cd52ae78d..9c6738c1711e673bcc8350aea5a14fe8bd83ef69 100644 (file)
--- a/makefile
+++ b/makefile
@@ -15,7 +15,8 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)\r
 WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
 \r
-16LIBOBJS = 16_in.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ)\r
+16LIBOBJS = 16_in.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) 16text.$(OBJ)\r
+GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ)
 \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\r
 \r
@@ -29,14 +30,14 @@ 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)\r
 scroll.$(OBJ): $(SRC)scroll.c\r
        wcl $(FLAGS) -c $(SRC)scroll.c\r
-test.exe: test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
+test.exe: test.$(OBJ) 16.lib\r
+       wcl $(FLAGS) test.$(OBJ) 16.lib\r
 \r
-test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
+test2.exe: test2.$(OBJ) 16.lib\r
+       wcl $(FLAGS) test2.$(OBJ) 16.lib\r
 \r
-fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ)\r
-       wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ)
+fonttest.exe: fonttest.$(OBJ) 16.lib\r
+       wcl $(FLAGS) fonttest.$(OBJ) 16.lib
 
 inputest.exe: inputest.$(OBJ) 16.lib\r
        wcl $(FLAGS) inputest.$(OBJ) 16.lib\r
@@ -47,17 +48,17 @@ inputest.exe: inputest.$(OBJ) 16.lib
 fonttest.$(OBJ): $(SRC)fonttest.c\r
        wcl -c $(SRC)fonttest.c\r
 \r
-pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ)\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) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\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)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\r
-       wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ)\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
@@ -107,8 +108,11 @@ inputest.$(OBJ): $(SRC)inputest.c
 #\r
 #non executable objects libraries\r
 #\r
-16.lib: $(16LIBOBJS)\r
-       wlib -b 16.lib $(16LIBOBJS)\r
+16.lib: $(16LIBOBJS) gfx.lib\r
+       wlib -b 16.lib $(16LIBOBJS) gfx.lib
+
+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

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

diff --git a/palettec.exe b/palettec.exe
index be132cedd55d13d47083f6c699d41867c2a47bce..fa4b8c085d9823bbf0c721965c46bf95f076d9a8 100644 (file)
Binary files a/palettec.exe and b/palettec.exe differ

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

diff --git a/scroll.exe b/scroll.exe
index 0be455b72f16d7dbd74348900652387beeffcbce..9da91bdd00ee9a8585f985ca9f9b0898618fb7cb 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

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

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