From: sparky4 <sparky4@cock.li>
Date: Fri, 6 Jan 2017 18:22:07 +0000 (-0600)
Subject: makefile polished!! it seems everything works reletively ok
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=2f29a6085156377dfe51285f7afbe3bc83b660a8;p=16.git

makefile polished!! it seems everything works reletively ok
---

diff --git a/MEMINFO.16W b/MEMINFO.16W
new file mode 100755
index 00000000..e69de29b
diff --git a/data/G.PAL b/data/G.PAL
index 0ecbac33..906897bc 100755
Binary files a/data/G.PAL and b/data/G.PAL differ
diff --git a/fmemtest.exe b/fmemtest.exe
index 1dd10568..589f2c35 100755
Binary files a/fmemtest.exe and b/fmemtest.exe differ
diff --git a/fontgfx.exe b/fontgfx.exe
index 49b58b65..64936bb0 100755
Binary files a/fontgfx.exe and b/fontgfx.exe differ
diff --git a/fonttest.exe b/fonttest.exe
index 99e247b8..bc9de1e4 100755
Binary files a/fonttest.exe and b/fonttest.exe differ
diff --git a/makefile b/makefile
index 21bdfacc..99430512 100755
--- a/makefile
+++ b/makefile
@@ -187,8 +187,9 @@ TESTEXEC2 = &
 	test.exe &
 	test0.exe &
 	pcxtest.exe &
-	pcxtest2.exe &
 	$(EXTERNTESTEXEC)
+TESTEXEC3= &
+	pcxtest2.exe
 UTILEXEC = &
 	palettel.exe &
 	palettec.exe
@@ -233,7 +234,7 @@ palettec.exe:	 palettec.$(OBJ) gfx.lib $(DOSLIB)
 palettel.exe:	 palettel.$(OBJ) gfx.lib $(DOSLIB)
 pcxtest2.exe:	 pcxtest2.$(OBJ) gfx.lib $(DOSLIB)
 #planrpcx.exe:	planrpcx.$(OBJ) gfx.lib
-maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
+maptest.exe:	maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 fmemtest.exe:	 fmemtest.$(OBJ)
 exmmtest.exe:	 exmmtest.$(OBJ) $(16LIB) $(DOSLIB)
 vgmtest.exe:	vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB)
diff --git a/maptest.exe b/maptest.exe
index e387020e..19c50991 100755
Binary files a/maptest.exe and b/maptest.exe differ
diff --git a/pcxtest.exe b/pcxtest.exe
index 0e40a2ec..f1a5d635 100755
Binary files a/pcxtest.exe and b/pcxtest.exe differ
diff --git a/pcxtest2.exe b/pcxtest2.exe
index caffd3da..63e6ab8f 100755
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
diff --git a/src/fmemtest.c b/src/fmemtest.c
index 4726e9a3..df0efd65 100755
--- a/src/fmemtest.c
+++ b/src/fmemtest.c
@@ -23,7 +23,7 @@
 #include "src/lib/16_head.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
-#include "src/lib/types.h"
+#include "src/lib/16_t.h"
 
 void
 main(int argc, char *argv[])
diff --git a/src/fontgfx.c b/src/fontgfx.c
index 90d0efc4..0589a493 100755
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -21,7 +21,7 @@
  */
 #include <stdio.h>
 #include <conio.h>
-#include "src/lib/types.h"
+#include "src/lib/16_t.h"
 //#include "lib/16text.h"
 #include "src/lib/16_vl.h"
 
diff --git a/src/maptest.c b/src/maptest.c
index b77b5e55..33016249 100755
--- a/src/maptest.c
+++ b/src/maptest.c
@@ -47,7 +47,7 @@ main(int argc, char *argv[])
 	if(map.width*map.height != 1200) exit(-3);
 	for(i=0; i<(map.width*map.height); i++)
 	{
-		fprintf(stdout, "%04d[%02d]", i, map.data[0][i]);
+		fprintf(stdout, "%04d[%02d]", i, map.data[i]);
 		if(i && !(i%map.width)) fprintf(stdout, "\n");
 	}
 	fprintf(stdout, "\n");
diff --git a/test.exe b/test.exe
index 434bf1a8..559da1ae 100755
Binary files a/test.exe and b/test.exe differ
diff --git a/test0.exe b/test0.exe
index 31c4ed41..d3554f97 100755
Binary files a/test0.exe and b/test0.exe differ