OSDN Git Service

makefile polished!! it seems everything works reletively ok
authorsparky4 <sparky4@cock.li>
Fri, 6 Jan 2017 18:22:07 +0000 (12:22 -0600)
committersparky4 <sparky4@cock.li>
Fri, 6 Jan 2017 18:22:07 +0000 (12:22 -0600)
14 files changed:
MEMINFO.16W [new file with mode: 0755]
data/G.PAL
fmemtest.exe
fontgfx.exe
fonttest.exe
makefile
maptest.exe
pcxtest.exe
pcxtest2.exe
src/fmemtest.c
src/fontgfx.c
src/maptest.c
test.exe
test0.exe

diff --git a/MEMINFO.16W b/MEMINFO.16W
new file mode 100755 (executable)
index 0000000..e69de29
index 0ecbac3..906897b 100755 (executable)
Binary files a/data/G.PAL and b/data/G.PAL differ
index 1dd1056..589f2c3 100755 (executable)
Binary files a/fmemtest.exe and b/fmemtest.exe differ
index 49b58b6..64936bb 100755 (executable)
Binary files a/fontgfx.exe and b/fontgfx.exe differ
index 99e247b..bc9de1e 100755 (executable)
Binary files a/fonttest.exe and b/fonttest.exe differ
index 21bdfac..9943051 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)
index e387020..19c5099 100755 (executable)
Binary files a/maptest.exe and b/maptest.exe differ
index 0e40a2e..f1a5d63 100755 (executable)
Binary files a/pcxtest.exe and b/pcxtest.exe differ
index caffd3d..63e6ab8 100755 (executable)
Binary files a/pcxtest2.exe and b/pcxtest2.exe differ
index 4726e9a..df0efd6 100755 (executable)
@@ -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
index 90d0efc..0589a49 100755 (executable)
@@ -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
index b77b5e5..3301624 100755 (executable)
@@ -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
index 434bf1a..559da1a 100755 (executable)
Binary files a/test.exe and b/test.exe differ
index 31c4ed4..d3554f9 100755 (executable)
Binary files a/test0.exe and b/test0.exe differ