Merge remote-tracking branch 'upstream/master'

[16.git] / makefile

diff --git a/makefile b/makefile
index e58e6e58997c8b80060436aa81ba96ac8384209e..2d44a1b8e84fa7a08ae02b19e9e8d4e3b1cb04e1 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -156,24 +156,28 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 TESTEXEC = &
     tesuto.exe &
     0.exe &
-    test.exe &
-    test0.exe &
-    pcxtest.exe &
-    pcxtest2.exe &
-    palettec.exe &
+    scroll.exe &
+    zcroll.exe &
+    exmmtest.exe &
+    vrstest.exe
+TESTEXEC2 = &
+    vgmtest.exe &
+    inputest.exe &
     maptest.exe &
     fmemtest.exe &
     fonttest.exe &
     fontgfx.exe &
-    scroll.exe &
-    vgmtest.exe &
-    inputest.exe &
+    test.exe &
+    test0.exe &
+    pcxtest.exe &
+    pcxtest2.exe
+UTILEXEC = &
     palettel.exe &
-    exmmtest.exe &
-    vrstest.exe
+    palettec.exe
 EXEC = &
     16.exe &
     bakapi.exe &
+    $(UTILEXEC) &
     $(TESTEXEC)
 
 all: $(EXEC) joytest.exe
@@ -189,6 +193,8 @@ bakapi.exe:       bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS)
 #
 scroll.exe:       scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 scroll.$(OBJ):    $(SRC)/scroll.c
+zcroll.exe:       zcroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+zcroll.$(OBJ):    $(SRC)/zcroll.c
 tesuto.exe:       tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIBLIBS)
 tesuto.$(OBJ):    $(SRC)/tesuto.c
 0.exe:            0.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)