[16_ca needs huge amounts of work and I should remember what needs to be done soon...

[16.git] / makefile

diff --git a/makefile b/makefile
index 306538e046912856e9a22ae6119d1dfb806ff19a..8ed9b91acce7cb5dd3efd5961cd6314b52513710 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -34,7 +34,7 @@
 # comment this out on game release.
 # serial output goes to COM1 at 9600 baud 1 stop bit odd parity.
 # serial output is plain text ASCII.
-DEBUGSERIAL=1
+DEBUGSERIAL=0
 
 DELLOGFILE=1
 
@@ -135,7 +135,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)
-16LIBOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(OBJ) 16_head.$(OBJ) 16_in.$(OBJ) 16_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+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
 DOSLIBOBJ += 8250.$(OBJ)
@@ -187,7 +187,7 @@ EXTERNTESTEXEC = &
        wcpu.exe &
        db.exe
 TESTEXEC = &
-       test.exe &
+       vidtest.exe &
        tesuto.exe &
        0.exe &
        exmmtest.exe &
@@ -254,13 +254,14 @@ tesuto.exe:       tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
 tesuto.$(OBJ): $(SRC)/tesuto.c
 0.exe:                 0.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 0.$(OBJ):               $(SRC)/0.c
-test.exe:               test.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+vidtest.exe:            vidtest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 #test2.exe:    test2.$(OBJ) gfx.lib $(DOSLIB)
 test0.exe:             test0.$(OBJ)
 fonttest.exe:   fonttest.$(OBJ) gfx.lib
 #fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
 fontgfx.exe:   fontgfx.$(OBJ) gfx.lib $(DOSLIB)
 inputest.exe:   inputest.$(OBJ) $(16LIB) $(DOSLIB) gfx.lib
+#inntest.exe:          inntest.$(OBJ)  $(16LIBNOINOBJS) 16_in_1.$(OBJ) $(DOSLIB) gfx.lib
 #sountest.exe: sountest.$(OBJ) $(16LIB)
 pcxtest.exe:   pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:   vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -282,7 +283,7 @@ wcpu.exe:           wcpu.$(OBJ) $(16LIB) $(DOSLIB)
 #
 16.$(OBJ):             $(SRC)/16.c $(SRC)/16.h
 bakapi.$(OBJ): $(SRC)/bakapi.c $(SRC)/bakapi.h
-test.$(OBJ):   $(SRC)/test.c $(SRCLIB)/16_vl.h
+vidtest.$(OBJ):        $(SRC)/vidtest.c $(SRCLIB)/16_vl.h
 #test2.$(OBJ): $(SRC)/test2.c $(SRCLIB)/16_vl.h
 test0.$(OBJ):   $(SRC)/test0.c
 pcxtest.$(OBJ):$(SRC)/pcxtest.c $(SRCLIB)/16_vl.h
@@ -301,6 +302,7 @@ fonttest.$(OBJ):$(SRC)/fonttest.c
 #fonttes0.$(OBJ): $(SRC)/fonttes0.c
 fontgfx.$(OBJ):$(SRC)/fontgfx.c
 inputest.$(OBJ):$(SRC)/inputest.c
+#inntest.$(OBJ):$(SRC)/inntest.c
 #sountest.$(OBJ): $(SRC)/sountest.c
 #miditest.$(OBJ): $(SRC)/miditest.c
 #testemm.$(OBJ):$(SRC)/testemm.c
@@ -355,10 +357,12 @@ mapread.$(OBJ):$(SRCLIB)/mapread.c $(SRCLIB)/mapread.h
 16_map.$(OBJ):$(SRCLIB)/16_map.c $(SRCLIB)/16_map.h
 16_timer.$(OBJ):$(SRCLIB)/16_timer.c $(SRCLIB)/16_timer.h
 16_in.$(OBJ):   $(SRCLIB)/16_in.c $(SRCLIB)/16_in.h
+16_in_1.$(OBJ):         $(SRCLIB)/16_in_1.c $(SRCLIB)/16_in_1.h
 16_rf.$(OBJ):   $(SRCLIB)/16_rf.c      $(SRCLIB)/16_rf.h
 16_mm.$(OBJ):   $(SRCLIB)/16_mm.c      $(SRCLIB)/16_mm.h
 16_pm.$(OBJ):   $(SRCLIB)/16_pm.c      $(SRCLIB)/16_pm.h
 16_ca.$(OBJ):   $(SRCLIB)/16_ca.c      $(SRCLIB)/16_ca.h
+16_us.$(OBJ):   $(SRCLIB)/16_us.c
 16_dbg.$(OBJ): $(SRCLIB)/16_dbg.c $(SRCLIB)/16_dbg.h
 midi.$(OBJ):   $(SRCLIB)/midi.c $(SRCLIB)/midi.h
 16_head.$(OBJ):$(SRCLIB)/16_head.c $(SRCLIB)/16_head.h
@@ -429,7 +433,7 @@ backupconfig: .symbolic
        @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)/git_modu.les
        @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)/git_igno.re
 
-initconfig:
+initconfig: .symbolic
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
        @$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore