From: sparky4 Date: Fri, 26 Jun 2015 22:08:39 +0000 (-0500) Subject: wwww ok X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=commitdiff_plain;h=c9827cf73d2e8de284981495424d74044afdfc13 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 a7096a2a..d273cb59 100644 Binary files a/16.LIB and b/16.LIB differ diff --git a/16.exe b/16.exe index d7fd0f66..43d3b6dd 100644 Binary files a/16.exe and b/16.exe differ diff --git a/GFX.LIB b/GFX.LIB new file mode 100644 index 00000000..a23acc98 Binary files /dev/null and b/GFX.LIB differ diff --git a/Project 16.bfproject b/Project 16.bfproject index 7c9223f3..92551881 100644 --- 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 c0d24493..ac1cda24 100644 Binary files a/fonttest.exe and b/fonttest.exe differ diff --git a/inputest.exe b/inputest.exe index bd0d00e8..c7826587 100644 Binary files a/inputest.exe and b/inputest.exe differ diff --git a/makefile b/makefile index f551eca6..9c6738c1 100644 --- a/makefile +++ b/makefile @@ -15,7 +15,8 @@ JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) EXMMLIB=$(SRCLIB)exmm$(DIRSEP) WCPULIB=$(SRCLIB)wcpu$(DIRSEP) -16LIBOBJS = 16_in.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) wcpu.$(OBJ) lib_head.$(OBJ) scroll16.$(OBJ) +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 @@ -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) scroll.$(OBJ): $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c -test.exe: test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ) - wcl $(FLAGS) test.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ) +test.exe: test.$(OBJ) 16.lib + wcl $(FLAGS) test.$(OBJ) 16.lib -test2.exe: test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ) - wcl $(FLAGS) test2.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ) +test2.exe: test2.$(OBJ) 16.lib + wcl $(FLAGS) test2.$(OBJ) 16.lib -fonttest.exe: 16text.$(OBJ) fonttest.$(OBJ) - wcl $(FLAGS) fonttest.$(OBJ) 16text.$(OBJ) +fonttest.exe: fonttest.$(OBJ) 16.lib + wcl $(FLAGS) fonttest.$(OBJ) 16.lib inputest.exe: inputest.$(OBJ) 16.lib wcl $(FLAGS) inputest.$(OBJ) 16.lib @@ -47,17 +48,17 @@ inputest.exe: inputest.$(OBJ) 16.lib fonttest.$(OBJ): $(SRC)fonttest.c wcl -c $(SRC)fonttest.c -pcxtest.exe: pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ) - wcl $(FLAGS) pcxtest.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) lib_head.$(OBJ) +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) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ) - wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(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)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ) - wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ)# modex16.$(OBJ) bitmap.$(OBJ) lib_head.$(OBJ) +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) @@ -107,8 +108,11 @@ inputest.$(OBJ): $(SRC)inputest.c # #non executable objects libraries # -16.lib: $(16LIBOBJS) - wlib -b 16.lib $(16LIBOBJS) +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 diff --git a/maptest.exe b/maptest.exe index 22ce45d7..a846d026 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/palettec.exe b/palettec.exe index be132ced..fa4b8c08 100644 Binary files a/palettec.exe and b/palettec.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index c75cd3b7..80badb00 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/scroll.exe b/scroll.exe index 0be455b7..9da91bdd 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/test.exe b/test.exe index c49bbaa8..c5c68fdb 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index d44b3468..0b074538 100644 Binary files a/test2.exe and b/test2.exe differ