added a library function for the game's gpl library~

	deleted:    16.exe
	modified:   Project 16.bfproject
	modified:   makefile
	modified:   scroll.exe
	new file:   src/lib/16.lbr

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

diff --git a/Project 16.bfproject b/Project 16.bfproject
index 7aa9fa1b5d9d40ca11e5a9cd27b23a9a29cf3ed5..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:
@@ -25,7 +25,7 @@ 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:7120:6381:1:
+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:
@@ -33,7 +33,7 @@ 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:3712:3110:0:
-openfiles: /dos/z/16/makefile:1190:45: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:
@@ -126,7 +126,7 @@ 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
 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: 

diff --git a/makefile b/makefile
index d1183b0e62e73624262abfd3238ec42a912405e5..fd200d8507ac80b99a973f5f5d56a444f934f943 100644 (file)
--- a/makefile
+++ b/makefile
@@ -12,18 +12,20 @@ SRC=src$(DIRSEP)
 SRCLIB=$(SRC)lib$(DIRSEP)\r
 JSMNLIB=$(SRCLIB)jsmn$(DIRSEP)
 EXMMLIB=$(SRCLIB)exmm$(DIRSEP)
-WCPULIB=$(SRCLIB)wcpu$(DIRSEP)\r
+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 \r
 
 #
 #executables
 #
-16.exe: 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj
-       wcl $(FLAGS) 16.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj scroll16.obj#planar.obj wcpu.obj
+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 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
+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
@@ -88,7 +90,10 @@ fmemtest.obj: $(SRC)fmemtest.c
 
 #
 #non executable objects libraries
-#\r
+#
+16.lib: $(SRCLIB)16.lbr $(16LIBOBJS)\r
+       wlib -b 16.lib $(16LIBOBJS)
+\r
 modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c\r
        wcl $(FLAGS) -c $(SRCLIB)modex16.c\r
 \r
@@ -107,11 +112,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
-mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c\r
-       wcl $(FLAGS) -c $(SRCLIB)mapread.c
+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\r
-       wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c\r
+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
index a05db9fb065d623d6bb17232b8408d823ff01860..88867163851199635d27901d1e7d603812231fae 100644 (file)
Binary files a/scroll.exe and b/scroll.exe differ

diff --git a/src/lib/16.lbr b/src/lib/16.lbr
new file mode 100644 (file)
index 0000000..4adc9bf
--- /dev/null
+++ b/src/lib/16.lbr
@@ -0,0 +1,7 @@
++-modex16.obj &
++-dos_kb.obj &
++-bitmap.obj &
++-planar.obj &
++-wcpu.obj &
++-lib_head.obj &
++-scroll16.obj
\ No newline at end of file