p16 is being worked on a bunch by me wwww [16_ca needs huge amounts of work and I...

[16.git] / makefile

diff --git a/makefile b/makefile
index 3e73a7cb84649237ff8787bbe2269cdfd78c4afe..13cc2191e43de5bfacb0ca4423ddb75ac83dd81d 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -117,7 +117,7 @@ UPXQ=-qqq
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k24576#32768
 Z_FLAGS=-zk0 -zc -zm#### -zp4 -ei
 O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm
-T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)##-e=65536
+T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ)## -e=65536
 
 DBUGFLAGS=-fm=$^&.meh -fd=$^&
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
@@ -134,7 +134,7 @@ LIBFLAGS=$(WLIBQ) -b -n
 #
 VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(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)
+GFXLIBOBJS = 16_vl.$(OBJ) 16_vl_1.$(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_head.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) 16_in.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
@@ -188,13 +188,13 @@ EXTERNTESTEXEC = &
        db.exe
 TESTEXEC = &
        vidtest.exe &
-       tesuto.exe &
-       0.exe &
        exmmtest.exe &
        vgmtest.exe &
        xcroll.exe &
        inputest.exe &
        vrstest.exe &
+       tesuto.exe &
+       0.exe &
        maptest.exe
 #zcroll.exe &
 TESTEXEC2 = &
@@ -242,7 +242,7 @@ testexec: $(EXEC) $(TESTEXEC2)
 # game and bakapi executables
 #
 16.exe:                16.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-bakapi.exe:            bakapi.$(OBJ) gfx.lib $(DOSLIB)
+bakapi.exe:            bakapi.$(OBJ) gfx.lib $(DOSLIB) 16_wcpu.$(OBJ)
 
 #
 # Test Executables!
@@ -276,9 +276,10 @@ 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) $(16LIB)
 fmemtest.exe:   fmemtest.$(OBJ)
-exmmtest.exe:   exmmtest.$(OBJ) $(16LIB) $(DOSLIB)
+exmmtest.exe:   exmmtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 vgmtest.exe:   vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
 db.exe:                db.$(OBJ)
+ps.exe:                ps.$(OBJ) 16_head.$(OBJ)
 wcpu.exe:              wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 
 #
@@ -314,6 +315,7 @@ inputest.$(OBJ):$(SRC)/inputest.c
 exmmtest.$(OBJ):$(SRC)/exmmtest.c
 vgmtest.$(OBJ):$(SRC)/vgmtest.c
 db.$(OBJ):             $(UTIL)/db.c
+ps.$(OBJ):             $(SRC)/ps.c
 
 #
 # non executable objects libraries
@@ -345,8 +347,9 @@ joytest.exe:
        $(COPYCOMMAND) $(DOSLIB_JOYSTICK:$(to_os_path))$(DIRSEP)$(DOSLIB_MEMMODE)$(DIRSEP)test.exe joytest.exe
 
 16_vl.$(OBJ):  $(SRCLIB)/16_vl.c $(SRCLIB)/16_vl.h
+16_vl_1.$(OBJ):        $(SRCLIB)/16_vl_1.c $(SRCLIB)/16_vl.h
 16_vlpal.$(OBJ):       $(SRCLIB)/16_vlpa_.c    $(SRCLIB)/16_vlpal.c $(SRCLIB)/16_vlpal.h
-bakapee.$(OBJ):$(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
+bakapee.$(OBJ):        $(SRCLIB)/bakapee.c $(SRCLIB)/bakapee.h
 16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h
 16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
 16_vrs.$(OBJ): $(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIB)