merged makefile

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

diff --git a/16.exe b/16.exe
new file mode 100644 (file)
index 0000000..dc1c660
Binary files /dev/null and b/16.exe differ

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 551a7f7a99f520243ad069085ab08bda32316775..bd90fd237e1b293eae3ce74214c2d4197238b050 100644 (file)
--- a/Project 16.bfproject
+++ b/Project 16.bfproject
@@ -3,7 +3,7 @@ e2c.convert_num: 0
 openfiles: /dos/z/16/doc/project.txt:127:0:0:
 openfiles: /dos/z/16/src/palettec.c:882:0:0:
 openfiles: /dos/z/16/src/pcxtest.c:890:0:0:
-openfiles: /dos/z/16/src/scroll.c:4297:3926:0:
+openfiles: /dos/z/16/src/scroll.c:2890:2098:0:
 openfiles: /dos/z/16/src/fmemtest.c:891:0:0:
 openfiles: /dos/z/16/src/emmtest.c:439:0:0:
 openfiles: /dos/z/16/src/emsdump.c:890:0:0:
@@ -11,8 +11,8 @@ openfiles: /dos/z/16/src/maptest.c:890:0:0:
 openfiles: /dos/z/16/src/maptest0.c:890:0:0:
 openfiles: /dos/z/16/src/test.c:890:0:0:
 openfiles: /dos/z/16/src/test2.c:890:0:0:
-openfiles: /dos/z/16/src/lib/modex16.c:890:0:0:
-openfiles: /dos/z/16/src/lib/modex16.h:966:338:0:
+openfiles: /dos/z/16/src/lib/modex16.c:9618:9159:0:
+openfiles: /dos/z/16/src/lib/modex16.h:1107:338:0:
 openfiles: /dos/z/16/src/lib/planar.h:1008:127:0:
 openfiles: /dos/z/16/src/lib/planar.c:944:0:0:
 openfiles: /dos/z/16/src/lib/bitmap.c:890:0:0:
@@ -25,20 +25,20 @@ openfiles: /dos/z/16/src/lib/mapread.c:3072:1988:0:
 openfiles: /dos/z/16/src/lib/mapread.h:147:0:0:
 openfiles: /dos/z/16/src/lib/fmapread.c:5029:4541:0:
 openfiles: /dos/z/16/src/lib/fmapread.h:0:0:0:
-openfiles: /dos/z/16/src/lib/exmm/memory.c:308:215:0:
+openfiles: /dos/z/16/src/lib/exmm/memory.c:304:0:0:
 openfiles: /dos/z/16/src/lib/exmm/memory.h:0:0:0:
 openfiles: /dos/z/16/src/lib/exmm/emmsize.h:1223:819:0:
 openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.c:7182:6170:0:
 openfiles: /dos/z/16/src/lib/jsmn/farjsmn.h:861:381:0:
 openfiles: /dos/z/16/src/lib/lib_head.c:890:0:0:
-openfiles: /dos/z/16/src/lib/lib_head.h:890:338:0:
-openfiles: /dos/z/16/makefile:1190:45:0:
-openfiles: /dos/z/16/src/lib/types.h:1228:0:0:
+openfiles: /dos/z/16/src/lib/lib_head.h:3712:3110:0:
+openfiles: /dos/z/16/makefile:3054:2620:1:
+openfiles: /dos/z/16/src/lib/types.h:1216:27:0:
 openfiles: /dos/z/16/src/16.h:943:0:0:
 openfiles: /dos/z/16/src/16.c:928:0:0:
 openfiles: /dos/z/16/src/lib/scroll16.h:961:0:0:
-openfiles: /dos/z/16/src/lib/scroll16.c:944:0:1:
+openfiles: /dos/z/16/src/lib/scroll16.c:944:0:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -53,7 +53,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/src/lib
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: getfree
+ssearch_text: offset
 snr_casesens: 0
 view_blocks: 1
 name: Project 16
@@ -86,7 +86,7 @@ recent_files: file:///dos/z/16/16.c
 recent_files: file:///dos/z/16/src/lib/wcpu/wtest.c
 recent_files: file:///dos/z/16/src/lib/wcpu/wtest.h
 recent_files: file:///dos/z/16/src/lib/wcpu/makefile
-recent_files: file:///dos/z/16/src/lib/fmapread.c
+recent_files: file:///dos/z/16/src/lib/scroll16.c
 recent_files: file:///dos/z/16/doc/project.txt
 recent_files: file:///dos/z/16/src/palettec.c
 recent_files: file:///dos/z/16/src/pcxtest.c
@@ -104,29 +104,29 @@ recent_files: file:///dos/z/16/src/lib/planar.c
 recent_files: file:///dos/z/16/src/lib/bitmap.c
 recent_files: file:///dos/z/16/src/lib/modex16.c
 recent_files: file:///dos/z/16/src/lib/bitmap.h
-recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.c
 recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.h
 recent_files: file:///dos/z/16/src/lib/dos_kb.c
-recent_files: file:///dos/z/16/src/lib/dos_kb.h
 recent_files: file:///dos/z/16/src/lib/mapread.c
+recent_files: file:///dos/z/16/src/lib/dos_kb.h
+recent_files: file:///dos/z/16/src/lib/wcpu/wcpu.c
+recent_files: file:///dos/z/16/src/lib/fmapread.c
 recent_files: file:///dos/z/16/src/lib/mapread.h
 recent_files: file:///dos/z/16/src/lib/fmapread.h
-recent_files: file:///dos/z/16/src/lib/exmm/memory.h
 recent_files: file:///dos/z/16/src/lib/exmm/emmsize.h
-recent_files: file:///dos/z/16/src/lib/exmm/emmret.h
+recent_files: file:///dos/z/16/src/lib/exmm/memory.h
 recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.c
 recent_files: file:///dos/z/16/src/lib/exmm/memory.c
+recent_files: file:///dos/z/16/src/lib/exmm/emmret.h
 recent_files: file:///dos/z/16/src/lib/jsmn/farjsmn.h
-recent_files: file:///dos/z/16/src/lib/lib_head.c
 recent_files: file:///dos/z/16/src/lib/lib_head.h
+recent_files: file:///dos/z/16/src/lib/lib_head.c
 recent_files: file:///dos/z/16/makefile
 recent_files: file:///dos/z/16/src/lib/types.h
 recent_files: file:///dos/z/16/src/16.h
 recent_files: file:///dos/z/16/src/16.c
 recent_files: file:///dos/z/16/src/lib/scroll16.h
-recent_files: file:///dos/z/16/src/lib/scroll16.c
 snr_replacetype: 0
-savedir: file:///dos/z/16/src/lib
+savedir: file:///dos/z/16/src
 spell_check_default: 1
 spell_insert_entities: 0
 last_filefilter: 
@@ -136,7 +136,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: ]->
 searchlist: scroll
 searchlist: mscroll
 searchlist: mascroll
@@ -151,6 +150,7 @@ searchlist: free
 searchlist: gfree
 searchlist: gefree
 searchlist: getfree
+searchlist: offset
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0

diff --git a/makefile b/makefile
index 32cd430819c1e4cee748a3c35ba4c51a3c65dd9c..bd4c4eedf27726edfd9c266816704ab6d902d6b2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -10,20 +10,22 @@ REMOVECOMMAND=del
 DIRSEP=\\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
-all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe ftest.exe\r
-\r
-#\r
-#executables\r
-#\r
-16.exe: 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
-       wcl $(FLAGS) 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj\r
-\r
-scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj\r
-       wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj# 16/lib/x/modex.lib\r
+JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
+EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
+WCPULIB=$(SRCLIB)wcpu$(DIRSEP)
+
+16LIBOBJS = modex16.obj dos_kb.obj bitmap.obj planar.obj wcpu.obj lib_head.obj scroll16.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 ftest.exe \r
+
+#
+#executables
+#
+16.exe: 16.obj mapread.obj jsmn.obj 16.lib
+       wcl $(FLAGS) 16.obj mapread.obj jsmn.obj 16.lib
+\r
+scroll.exe: scroll.obj 16.lib mapread.obj jsmn.obj\r
+       wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.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
@@ -93,11 +95,14 @@ emsdump.obj: $(SRC)emsdump.c
        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
+
+#
+#non executable objects libraries
+#
+16.lib: $(16LIBOBJS)\r
+       wlib -b 16.lib $(16LIBOBJS)
 \r
-#\r
-#non executable objects libraries\r
-#\r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
@@ -116,11 +121,11 @@ scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c
 wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c\r
        wcl $(FLAGS) -c $(WCPULIB)wcpu.c\r
 \r
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c\r
-\r
-fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c\r
+mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16.lib\r
+       wcl $(FLAGS) -c $(SRCLIB)mapread.c 16.lib
+
+fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib\r
+       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib\r
 \r
 lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c\r
        wcl $(FLAGS) -c $(SRCLIB)lib_head.c\r

diff --git a/scroll.exe b/scroll.exe
new file mode 100644 (file)
index 0000000..daf1175
Binary files /dev/null and b/scroll.exe differ