From: sparky4 Date: Fri, 5 Jun 2015 17:21:42 +0000 (-0500) Subject: almost~ X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=e578b86537254acd44650e47543aee750476ab3f;p=16.git almost~ modified: .gitignore modified: Project 16.bfproject modified: emmtest.exe new file: emsdump.exe deleted: fartest.exe modified: fmemtest.exe modified: makefile modified: makefile~ modified: maptest.exe modified: maptest0.exe modified: pcxtest.exe modified: scroll.exe renamed: src/fartest.c -> src/emsdump.c modified: test.exe modified: test2.exe --- diff --git a/.gitignore b/.gitignore index 54a1f6db..8960afa1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ FUCK *.err *.ERR +makefile~ !boop.sh img !.git/config diff --git a/Project 16.bfproject b/Project 16.bfproject index 737dcb9b..0b00c5af 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -4,9 +4,9 @@ openfiles: /dos/z/16/doc/project.txt:138:0:0: openfiles: /dos/z/16/src/palettec.c:179:0:0: openfiles: /dos/z/16/src/pcxtest.c:1431:2127:0: openfiles: /dos/z/16/src/scroll.c:3841:2952:0: -openfiles: /dos/z/16/src/fmemtest.c:415:0:0: +openfiles: /dos/z/16/src/fmemtest.c:150:0:0: openfiles: /dos/z/16/src/emmtest.c:732:160:0: -openfiles: /dos/z/16/src/fartest.c:948:0:0: +openfiles: /dos/z/16/src/emsdump.c:456:0:0: openfiles: /dos/z/16/src/maptest.c:69:0:0: openfiles: /dos/z/16/src/maptest0.c:253:85:0: openfiles: /dos/z/16/src/test.c:0:0:0: @@ -23,11 +23,11 @@ openfiles: /dos/z/16/src/lib/mapread.c:4790:4435:0: openfiles: /dos/z/16/src/lib/mapread.h:285:23:0: openfiles: /dos/z/16/src/lib/jsmn/jsmn.c:4073:3697:0: openfiles: /dos/z/16/src/lib/jsmn/jsmn.h:1635:826:0: -openfiles: /dos/z/16/src/lib/exmm/memory.c:496:0:1: +openfiles: /dos/z/16/src/lib/exmm/memory.c:496:0:0: openfiles: /dos/z/16/src/lib/exmm/memory.h:0:0:0: openfiles: /dos/z/16/src/lib/exmm/emmsize.h:0:0:0: openfiles: /dos/z/16/src/lib/exmm/emmret.h:0:0:0: -openfiles: /dos/z/16/makefile:143:0:0: +openfiles: /dos/z/16/makefile:2267:2340:1: openfiles: /dos/z/16/src/lib/types.h:165:0:0: snr_recursion_level: 0 convertcolumn_horizontally: 0 diff --git a/emmtest.exe b/emmtest.exe index 8b137891..508418b4 100644 Binary files a/emmtest.exe and b/emmtest.exe differ diff --git a/emsdump.exe b/emsdump.exe new file mode 100644 index 00000000..fda5ffd1 Binary files /dev/null and b/emsdump.exe differ diff --git a/fartest.exe b/fartest.exe deleted file mode 100644 index 8b137891..00000000 --- a/fartest.exe +++ /dev/null @@ -1 +0,0 @@ - diff --git a/fmemtest.exe b/fmemtest.exe index 8b137891..b50e3f3d 100644 Binary files a/fmemtest.exe and b/fmemtest.exe differ diff --git a/makefile b/makefile index 91b877f5..0e4f6711 100644 --- a/makefile +++ b/makefile @@ -12,7 +12,7 @@ SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) EXMMLIB=$(SRCLIB)exmm$(DIRSEP) -all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe fmemtest.exe +all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe emsdump.exe emmtest.exe fmemtest.exe # #executables @@ -39,8 +39,11 @@ maptest0.exe: maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head. emmtest.exe: emmtest.obj memory.obj wcl $(FLAGS) emmtest.obj memory.obj -fartest.exe: fartest.obj memory.obj - wcl $(FLAGS) fartest.obj memory.obj +emsdump.exe: emsdump.obj memory.obj + wcl $(FLAGS) emsdump.obj memory.obj + +fmemtest.exe: fmemtest.obj# memory.obj + wcl $(FLAGS) fmemtest.obj# memory.obj # #executable's objects @@ -63,8 +66,8 @@ maptest0.obj: $(SRC)maptest0.c $(SRCLIB)modex16.h emmtest.obj: $(SRC)emmtest.c wcl $(FLAGS) -c $(SRC)emmtest.c -fartest.obj: $(SRC)fartest.c - wcl $(FLAGS) -c $(SRC)fartest.c +emsdump.obj: $(SRC)emsdump.c + wcl $(FLAGS) -c $(SRC)emsdump.c fmemtest.obj: $(SRC)fmemtest.c wcl $(FLAGS) -c $(SRC)fmemtest.c diff --git a/makefile~ b/makefile~ index 024480cf..9e5492d9 100644 --- a/makefile~ +++ b/makefile~ @@ -12,8 +12,11 @@ SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) EXMMLIB=$(SRCLIB)exmm$(DIRSEP) -all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe - +all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe fartest.exe emmtest.exe fmemtest.exe + +# +#executables +# scroll.exe: scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj wcl $(FLAGS) scroll.obj modex16.obj dos_kb.obj bitmap.obj mapread.obj jsmn.obj lib_head.obj# 16/lib/x/modex.lib scroll.obj: $(SRC)scroll.c @@ -39,7 +42,12 @@ emmtest.exe: emmtest.obj memory.obj fartest.exe: fartest.obj memory.obj wcl $(FLAGS) fartest.obj memory.obj - +fmemtest.exe: fmemtest.obj# memory.obj + wcl $(FLAGS) fmemtest.obj# memory.obj + +# +#executable's objects +# test.obj: $(SRC)test.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)test.c @@ -61,7 +69,12 @@ emmtest.obj: $(SRC)emmtest.c fartest.obj: $(SRC)fartest.c wcl $(FLAGS) -c $(SRC)fartest.c - +fmemtest.obj: $(SRC)fmemtest.c + wcl $(FLAGS) -c $(SRC)fmemtest.c + +# +#non executable objects libraries +# modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -85,7 +98,10 @@ jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c wcl $(FLAGS) -c $(EXMMLIB)memory.c - + +# +#other~ +# clean: .symbolic # @$(REMOVECOMMAND) *.obj @$(REMOVECOMMAND) *.OBJ diff --git a/maptest.exe b/maptest.exe index 8b137891..4bd8da12 100644 Binary files a/maptest.exe and b/maptest.exe differ diff --git a/maptest0.exe b/maptest0.exe index 8b137891..0930c208 100644 Binary files a/maptest0.exe and b/maptest0.exe differ diff --git a/pcxtest.exe b/pcxtest.exe index 8b137891..29b668ff 100644 Binary files a/pcxtest.exe and b/pcxtest.exe differ diff --git a/scroll.exe b/scroll.exe index 8b137891..a72bd9b5 100644 Binary files a/scroll.exe and b/scroll.exe differ diff --git a/src/fartest.c b/src/emsdump.c similarity index 100% rename from src/fartest.c rename to src/emsdump.c diff --git a/test.exe b/test.exe index 8b137891..18da51ec 100644 Binary files a/test.exe and b/test.exe differ diff --git a/test2.exe b/test2.exe index 8b137891..19d9b64d 100644 Binary files a/test2.exe and b/test2.exe differ