makefile polished!! it seems everything works reletively ok

diff --git a/MEMINFO.16W b/MEMINFO.16W
new file mode 100755 (executable)
index 0000000..e69de29

diff --git a/data/G.PAL b/data/G.PAL
index 0ecbac33f44529d9701eae8c9b262c7da0f50416..906897bc70e146ee900bce31986fb34212d9f138 100755 (executable)
Binary files a/data/G.PAL and b/data/G.PAL differ

diff --git a/fmemtest.exe b/fmemtest.exe
index 1dd10568a4713b5a38a2ee5dd083b50e8f3526e9..589f2c3568c46131bc98005a37076822806b5e87 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ

diff --git a/fontgfx.exe b/fontgfx.exe
index 49b58b6541089846df3750f0bec102ffa2bfa3b9..64936bb0dc0634714d23913ca20620dd4c115f04 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ

diff --git a/fonttest.exe b/fonttest.exe
index 99e247b8a89a6997c59481e248baa8697c7b7a54..bc9de1e48a724009ec406ae113b271bf278a521c 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ

diff --git a/makefile b/makefile
index 21bdfacc14a020ab71be2fb9b1c55858a9781a15..99430512251f871fd909d16cab490d50db1546ac 100755 (executable)
--- 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 e387020e13be95fb4c16c586280a10056b7a0991..19c50991213bb84f4200c0a58e682f942fb6027a 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ

diff --git a/pcxtest.exe b/pcxtest.exe
index 0e40a2ec1bcbfbbce18d0ecb6271512e2b125df5..f1a5d635f4e87c9fd1715f9fb5b0b0e845e3d708 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ

diff --git a/pcxtest2.exe b/pcxtest2.exe
index caffd3da7ada24a40a0d33f61dc25a6750775299..63e6ab8f5c4ba9bb9579ff734f74a7739175993b 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ

diff --git a/src/fmemtest.c b/src/fmemtest.c
index 4726e9a33fd92ce70e9bcfe0cdc6746ed1ef9482..df0efd6527d6a6dfbfff5470a465335461ed6005 100755 (executable)
--- a/src/fmemtest.c
+++ b/src/fmemtest.c
@@ -23,7 +23,7 @@
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
-#include "src/lib/types.h"\r
+#include "src/lib/16_t.h"\r
 \r
 void\r
 main(int argc, char *argv[])\r

diff --git a/src/fontgfx.c b/src/fontgfx.c
index 90d0efc4c1bf566e61a84b259e208fd11af4ea3d..0589a493f5dbe62cde05b0a4c250dde751c6003f 100755 (executable)
--- a/src/fontgfx.c
+++ b/src/fontgfx.c
@@ -21,7 +21,7 @@
  */\r
 #include <stdio.h>\r
 #include <conio.h>\r
-#include "src/lib/types.h"\r
+#include "src/lib/16_t.h"\r
 //#include "lib/16text.h"\r
 #include "src/lib/16_vl.h"\r
 \r

diff --git a/src/maptest.c b/src/maptest.c
index b77b5e55ff581c2f6bc53db4648ee33ff9a48271..330162499e831f6b52dddf9faa37f87a8766e426 100755 (executable)
--- 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);\r
        for(i=0; i<(map.width*map.height); i++)\r
        {\r
-               fprintf(stdout, "%04d[%02d]", i, map.data[0][i]);\r
+               fprintf(stdout, "%04d[%02d]", i, map.data[i]);\r
                if(i && !(i%map.width)) fprintf(stdout, "\n");\r
        }\r
        fprintf(stdout, "\n");\r

diff --git a/test.exe b/test.exe
index 434bf1a81eaecb8f725b55ee6e474c72a0a7aa27..559da1aef2b1b0631cd4d1a4366582221d5d355f 100755 (executable)
Binary files a/test.exe and b/test.exe differ

diff --git a/test0.exe b/test0.exe
index 31c4ed411655c2f8eecc3f18a69cd94a4c0878e7..d3554f9736d20238426a6ee03880418422213b23 100755 (executable)
Binary files a/test0.exe and b/test0.exe differ