wwww ok wwwww zscroll and scroll compile disabled due to me being too tired to whack...

[16.git] / makefile

diff --git a/makefile b/makefile
index 9f53f52a149695b989ba58f5b5732622cbc88f79..2d46a27c60a9e824abf86a8fbb1eb806cbb4ac9a 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -109,7 +109,6 @@ VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
 OLDLIBOBJS=bitmap.$(OBJ) mapread.$(OBJ) 16render.$(OBJ)
 GFXLIBOBJS = 16_vl.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16_vrs.$(OBJ) 16_sprit.$(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) wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ)
-####++++ 16_map.$(OBJ)
 #16planar.$(OBJ) planar.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -158,12 +157,12 @@ DOSLIBLIBS += $(DOSLIB_8250)/dos86h/8250.lib
 TESTEXEC = &
        tesuto.exe &
        0.exe &
+       exmmtest.exe &
+       vgmtest.exe &
        scroll.exe &
        zcroll.exe &
-       exmmtest.exe &
        vrstest.exe
 TESTEXEC2 = &
-       vgmtest.exe &
        inputest.exe &
        maptest.exe &
        fmemtest.exe &
@@ -407,6 +406,7 @@ reinitlibs: .symbolic
        @rm -rf 16/CatacombApocalypse
        @rm -rf 16/wolf3d
        @rm -rf 16/keen
+       @rm -rf 16/Catacomb3D
        @wmake -h initlibs
 
 initlibs: .symbolic