From: sparky4 Date: Sun, 21 Jun 2015 09:03:56 +0000 (-0500) Subject: added a library function for the game's gpl library~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=48b52c6681fb990015e663a33b86a64af7abc85f;p=16.git 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 index 92453743..00000000 Binary files a/16.exe and /dev/null differ diff --git a/Project 16.bfproject b/Project 16.bfproject index 7aa9fa1b..bd90fd23 100644 --- 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 d1183b0e..fd200d85 100644 --- a/makefile +++ b/makefile @@ -12,18 +12,20 @@ SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) EXMMLIB=$(SRCLIB)exmm$(DIRSEP) -WCPULIB=$(SRCLIB)wcpu$(DIRSEP) +WCPULIB=$(SRCLIB)wcpu$(DIRSEP) + +16LIBOBJS = modex16.obj dos_kb.obj bitmap.obj planar.obj wcpu.obj lib_head.obj scroll16.obj all: 16.exe test.exe pcxtest.exe test2.exe scroll.exe palettec.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe # #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 -scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj - wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj planar.obj mapread.obj jsmn.obj wcpu.obj# 16/lib/x/modex.lib +scroll.exe: scroll.obj 16.lib mapread.obj jsmn.obj + wcl $(FLAGS) scroll.obj 16.lib mapread.obj jsmn.obj scroll.obj: $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c test.exe: test.obj modex16.obj bitmap.obj lib_head.obj @@ -88,7 +90,10 @@ fmemtest.obj: $(SRC)fmemtest.c # #non executable objects libraries -# +# +16.lib: $(SRCLIB)16.lbr $(16LIBOBJS) + wlib -b 16.lib $(16LIBOBJS) + modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -107,11 +112,11 @@ scroll16.obj: $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c wcpu.obj: $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c wcl $(FLAGS) -c $(WCPULIB)wcpu.c -mapread.obj: $(SRCLIB)mapread.h $(SRCLIB)mapread.c - wcl $(FLAGS) -c $(SRCLIB)mapread.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 - wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c +fmapread.obj: $(SRCLIB)fmapread.h $(SRCLIB)fmapread.c 16.lib + wcl $(FLAGS) $(MFLAGS) -c $(SRCLIB)fmapread.c 16.lib lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c wcl $(FLAGS) -c $(SRCLIB)lib_head.c diff --git a/scroll.exe b/scroll.exe index a05db9fb..88867163 100644 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 index 00000000..4adc9bf7 --- /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