palette is now arrays

[16.git] / makefile

diff --git a/makefile b/makefile
index 9440b2da39208c01a077f842aad11e8802a07632..5ebf3d5cde95bcaedb28a3b98ab16ba185439be4 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -123,7 +123,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 # objects
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
+#OLDLIBOBJS=bitmap.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16_vlpal.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_spri.$(OBJ) $(OLDLIBOBJS)
 16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_in.$(OBJ) 16_head.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ) 16_enti.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
@@ -182,13 +182,13 @@ TESTEXEC = &
        0.exe &
        exmmtest.exe &
        vgmtest.exe &
-       scroll.exe &
        zcroll.exe &
        inputest.exe &
-       pcxtest.exe &
        vrstest.exe &
        maptest.exe
 TESTEXEC2 = &
+       pcxtest.exe &
+       scroll.exe &
        fmemtest.exe &
        fonttest.exe &
        fontgfx.exe &