From: sparky4 <sparky4@cock.li>
Date: Tue, 23 Apr 2019 21:48:02 +0000 (-0500)
Subject: new jsmn issue
X-Git-Url: http://git.osdn.net/view?p=proj16%2F16.git;a=commitdiff_plain;h=5f780974edce32f52bae09d105019016980e5d2b

new jsmn issue
---

diff --git a/16/vgmtools b/16/vgmtools
index 7cf1dfc2..843aa682 160000
--- a/16/vgmtools
+++ b/16/vgmtools
@@ -1 +1 @@
-Subproject commit 7cf1dfc2bf854c8452fe944ebc5af97048e0fe94
+Subproject commit 843aa682c301f233e3aac93fc09533f370bd299c
diff --git a/makefile b/makefile
index c5bc46f1..f4df49f1 100755
--- a/makefile
+++ b/makefile
@@ -145,7 +145,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 VGMSNDOBJ = vgmSnd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(OBJ) 16_vl_2.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) scroll16.$(OBJ) 16_spri.$(OBJ) gamepal.$(OBJ)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16_sd.$(OBJ) 16_snd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
+16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ)  16_map.$(OBJ) 16_sd.$(OBJ) 16_snd.$(OBJ) 16_tail_.$(OBJ) 16_dbg_1.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -429,7 +429,7 @@ mapread.$(OBJ):	$(SRCLIB)/mapread.c	$(SRCLIB)/mapread.h
 16_hc.$(OBJ):	$(SRCLIB)/16_hc.c	$(SRCLIB)/16_hc.h
 16_snd.$(OBJ):	$(SRCLIB)/16_snd.c	$(SRCLIB)/16_snd.h
 16_sd.$(OBJ):	$(SRCLIB)/16_sd.c	$(SRCLIB)/16_sd.h
-jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c	$(JSMNLIB)/jsmn.h
+#jsmn.$(OBJ):	$(JSMNLIB)/jsmn.c	$(JSMNLIB)/jsmn.h
 kitten.$(OBJ):	$(NYANLIB)/kitten.c	$(NYANLIB)/kitten.h
 vgmSnd.$(OBJ):	$(VGMSNDLIB)/vgmSnd.c	$(VGMSNDLIB)/vgmSnd.h
 16_wcpu.$(OBJ):	$(WCPULIB)/16_wcpu.c	$(WCPULIB)/16_wcpu.h
@@ -618,6 +618,7 @@ cldl: .symbolic
 uplibs: .symbolic
 	@cd $(JSMNLIB:$(to_os_path))
 	@git pull
+	#@git checkout 18e9fe42cbfe21d65076f5c77ae2be379ad1270f
 	@cd $(BUILD_ROOT)
 	@cd $(DOSLIBDIR:$(to_os_path))
 	@git pull
diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 0481c83e..3e133574 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -23,6 +23,8 @@
 #ifndef _16_MAP__H_
 #define _16_MAP__H_
 
+#define JSMN_STATIC
+
 #include "src/lib/16_head.h"
 #include "src/lib/16_tdef.h"
 #include "src/lib/jsmn/jsmn.h"
@@ -41,6 +43,9 @@
 
 //typedefs moved to 16_tdef.h
 
+void jsmn_init(jsmn_parser *parser);
+int jsmn_parse(jsmn_parser *parser, const char *js, const size_t len, jsmntok_t *tokens, const unsigned int num_tokens);
+
 int jsoneq(const char *json, jsmntok_t *tok, const char *s);
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
 //int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
diff --git a/src/lib/doslib b/src/lib/doslib
index 70e1bd4b..fab74fea 160000
--- a/src/lib/doslib
+++ b/src/lib/doslib
@@ -1 +1 @@
-Subproject commit 70e1bd4be6c69685ca24ec5f92addc90096893e1
+Subproject commit fab74fea266c4542909a5a264012159706b6f912
diff --git a/src/lib/jsmn b/src/lib/jsmn
index 18e9fe42..fdcef3eb 160000
--- a/src/lib/jsmn
+++ b/src/lib/jsmn
@@ -1 +1 @@
-Subproject commit 18e9fe42cbfe21d65076f5c77ae2be379ad1270f
+Subproject commit fdcef3ebf886fa210d14956d3c068a653e76a24e
diff --git a/wantdbg.txt b/wantdbg.txt
new file mode 100755
index 00000000..a087a69a
--- /dev/null
+++ b/wantdbg.txt
@@ -0,0 +1,3 @@
+I/O
+Processor Status
+Memory