From 75e7cf251be21eb29a7c5df05b4b1320393214ff Mon Sep 17 00:00:00 2001 From: sparky4 Date: Fri, 5 Jun 2015 11:50:12 -0500 Subject: [PATCH] okies~ adding exmm testing stuff to the makefile~ modified: Project 16.bfproject renamed: src/lib/exmm/EMM.EXE -> emmtest.exe renamed: src/lib/exmm/FAR.EXE -> far.exe modified: makefile renamed: src/lib/exmm/emm.c -> src/emmtest.c renamed: src/lib/exmm/far.c -> src/far.c --- Project 16.bfproject | 22 ++++++++++++++------- src/lib/exmm/EMM.EXE => emmtest.exe | Bin src/lib/exmm/FAR.EXE => far.exe | Bin makefile | 29 ++++++++++++++++++++++------ src/{lib/exmm/emm.c => emmtest.c} | 4 ++-- src/{lib/exmm => }/far.c | 2 +- 6 files changed, 41 insertions(+), 16 deletions(-) rename src/lib/exmm/EMM.EXE => emmtest.exe (100%) rename src/lib/exmm/FAR.EXE => far.exe (100%) rename src/{lib/exmm/emm.c => emmtest.c} (96%) rename src/{lib/exmm => }/far.c (96%) diff --git a/Project 16.bfproject b/Project 16.bfproject index eca1e95e..0f65b2e9 100644 --- a/Project 16.bfproject +++ b/Project 16.bfproject @@ -1,9 +1,13 @@ c2e.convert_special: 0 e2c.convert_num: 0 -openfiles: /dos/z/16/doc/project.txt:138:0:0: +openfiles: /dos/z/16/doc/project.txt:138:0:1: openfiles: /dos/z/16/src/palettec.c:179:0:0: openfiles: /dos/z/16/src/pcxtest.c:504:0:0: openfiles: /dos/z/16/src/scroll.c:3841:2952:0: +openfiles: /dos/z/16/src/emmtest.c:493:554:0: +openfiles: /dos/z/16/src/far.c:126:0:0: +openfiles: /dos/z/16/src/maptest.c:69:0:0: +openfiles: /dos/z/16/src/maptest0.c:446:0:0: openfiles: /dos/z/16/src/test.c:0:0:0: openfiles: /dos/z/16/src/test2.c:0:0:0: openfiles: /dos/z/16/src/lib/planar.h:0:0:0: @@ -15,12 +19,11 @@ openfiles: /dos/z/16/src/lib/dos_kb.h:0:0:0: openfiles: /dos/z/16/src/lib/modex16.c:444:0:0: openfiles: /dos/z/16/src/lib/modex16.h:0:0:0: openfiles: /dos/z/16/src/lib/mapread.c:4790:4435:0: -openfiles: /dos/z/16/src/lib/mapread.h:285:89: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:866:1: -openfiles: /dos/z/16/src/maptest.c:69:0:0: -openfiles: /dos/z/16/src/maptest0.c:445:0:0: +openfiles: /dos/z/16/src/lib/jsmn/jsmn.h:1635:826:0: openfiles: /dos/z/16/16/dongs.c:963:0:0: +openfiles: /dos/z/16/makefile:1871:838:0: openfiles: /dos/z/16/src/lib/types.h:165:0:0: snr_recursion_level: 0 convertcolumn_horizontally: 0 @@ -33,7 +36,7 @@ view_left_panel: 0 default_mime_type: text/plain e2c.convert_xml: 1 c2e.convert_iso: 0 -opendir: file:///dos/z/16/src +opendir: file:///dos/z/16/src/lib/exmm wrap_text_default: 0 bookmarks_filename_mode: 1 ssearch_text: long @@ -82,8 +85,13 @@ recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.c recent_files: file:///dos/z/16/src/lib/jsmn/jsmn.h recent_files: file:///dos/z/16/src/maptest0.c recent_files: file:///dos/z/16/src/maptest.c +recent_files: file:///dos/z/16/makefile +recent_files: file:///dos/z/16/src/emm.c +recent_files: file:///dos/z/16/src/far.c +recent_files: file:///dos/z/16/src/emstest.c +recent_files: file:///dos/z/16/src/lib/exmm/x.bat snr_replacetype: 0 -savedir: file:///dos/z/16/src/lib/jsmn +savedir: file:///dos/z/16/doc spell_check_default: 1 spell_insert_entities: 0 last_filefilter: diff --git a/src/lib/exmm/EMM.EXE b/emmtest.exe similarity index 100% rename from src/lib/exmm/EMM.EXE rename to emmtest.exe diff --git a/src/lib/exmm/FAR.EXE b/far.exe similarity index 100% rename from src/lib/exmm/FAR.EXE rename to far.exe diff --git a/makefile b/makefile index 6530673d..da282ded 100644 --- a/makefile +++ b/makefile @@ -9,9 +9,10 @@ REMOVECOMMAND=del DIRSEP=\ SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) -JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) +JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) +EXMMLIB=$(SRCLIB)exmm$(DIRSEP) -all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe +all: test.exe pcxtest.exe test2.exe scroll.exe maptest.exe maptest0.exe far.exe emmtest.exe 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 @@ -30,7 +31,14 @@ maptest.exe: maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.ob wcl $(FLAGS) maptest.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj maptest0.exe: maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj - wcl $(FLAGS) maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj + wcl $(FLAGS) maptest0.obj mapread.obj jsmn.obj modex16.obj bitmap.obj lib_head.obj + +emmtest.exe: emmtest.obj memory.obj + wcl $(FLAGS) emmtest.obj memory.obj + +far.exe: far.obj memory.obj + wcl $(FLAGS) far.obj memory.obj + test.obj: $(SRC)test.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)test.c @@ -41,12 +49,18 @@ test2.obj: $(SRC)test2.c $(SRCLIB)modex16.h pcxtest.obj: $(SRC)pcxtest.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)pcxtest.c -maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h +maptest.obj: $(SRC)maptest.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)maptest.c maptest0.obj: $(SRC)maptest0.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)maptest0.c - + wcl $(FLAGS) -c $(SRC)maptest0.c + +emmtest.obj: $(SRC)emmtest.c + wcl $(FLAGS) -c $(SRC)emmtest.c + +far.obj: $(SRC)far.c + wcl $(FLAGS) -c $(SRC)far.c + modex16.obj: $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -68,6 +82,9 @@ lib_head.obj: $(SRCLIB)lib_head.h $(SRCLIB)lib_head.c jsmn.obj: $(JSMNLIB)jsmn.h $(JSMNLIB)jsmn.c wcl $(FLAGS) -c $(JSMNLIB)jsmn.c + +memory.obj: $(EXMMLIB)memory.h $(EXMMLIB)memory.c + wcl $(FLAGS) -c $(EXMMLIB)memory.c clean: .symbolic # @$(REMOVECOMMAND) *.obj diff --git a/src/lib/exmm/emm.c b/src/emmtest.c similarity index 96% rename from src/lib/exmm/emm.c rename to src/emmtest.c index c7ad3496..eefab9ea 100644 --- a/src/lib/exmm/emm.c +++ b/src/emmtest.c @@ -19,8 +19,8 @@ #include #include -#include "memory.h" -#include "../types.h" +#include "src/lib/exmm/memory.h" +#include "src/lib/types.h" #define PEMMDATAPAGENUM 4 diff --git a/src/lib/exmm/far.c b/src/far.c similarity index 96% rename from src/lib/exmm/far.c rename to src/far.c index 9d5f8f58..3ef9a2fc 100644 --- a/src/lib/exmm/far.c +++ b/src/far.c @@ -2,7 +2,7 @@ #include //#include -#include "memory.h" +#include "src/lib/exmm/memory.h" int main(int argc, char *argv[]) { -- 2.39.5