[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 b7a7a580bef5d9d67b4e0b08f70a5bb567d5320e..69486b5b6f15f0f40d768ca0fb44208e47d9f6e8 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=0
+DEBUGSERIAL=1
 
 DELLOGFILE=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
@@ -192,10 +192,11 @@ TESTEXEC = &
        0.exe &
        exmmtest.exe &
        vgmtest.exe &
-       zcroll.exe &
+       xcroll.exe &
        inputest.exe &
        vrstest.exe &
        maptest.exe
+#zcroll.exe &
 TESTEXEC2 = &
        pcxtest.exe &
        scroll.exe &
@@ -248,6 +249,8 @@ bakapi.exe:         bakapi.$(OBJ) gfx.lib $(DOSLIB)
 #
 scroll.exe:    scroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 scroll.$(OBJ): $(SRC)/scroll.c
+xcroll.exe:    xcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
+xcroll.$(OBJ): $(SRC)/xcroll.c
 zcroll.exe:    zcroll.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
 zcroll.$(OBJ): $(SRC)/zcroll.c
 tesuto.exe:    tesuto.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB)
@@ -273,7 +276,7 @@ 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)
 wcpu.exe:              wcpu.$(OBJ) $(16LIB) $(DOSLIB)
@@ -342,6 +345,7 @@ 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
 16render.$(OBJ):$(SRCLIB)/16render.c $(SRCLIB)/16render.h
@@ -357,7 +361,7 @@ 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_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
@@ -382,8 +386,8 @@ ll.$(OBJ):          $(SRCLIB)/ll.c  $(SRCLIB)/ll.h
 #other~
 #
 clean: .symbolic
-       @if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
-       @wmake -h initscript
+       @if not exist $(DOSLIBDIR)/buildall.sh wmake -s -h initlibs
+       @wmake -s -h initscript
        @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @if exist *.LIB $(REMOVECOMMAND) *.LIB
@@ -391,7 +395,7 @@ clean: .symbolic
        @if exist *.EXE $(REMOVECOMMAND) *.EXE
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
        #@for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
-       @if not exist vrl2vrs wmake -h pcx2vrl
+       @if not exist vrl2vrs wmake -s -h pcx2vrl
 !else
        @if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -470,11 +474,11 @@ www: .symbolic
        @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
        @./src/util/z2.sh data.zip data
-       @wmake -h wwwext
+       @wmake -s -h wwwext
 
 wwwext: .symbolic
-       @wmake -h wwwext1
-       @wmake -h wwwext2
+       @wmake -s -h wwwext1
+       @wmake -s -h wwwext2
 
 wwwext1: .symbolic
        ####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
@@ -529,11 +533,11 @@ reinitlibs: .symbolic
        @$(REMOVECOMMAND) -rf 16/wolf3d
        @$(REMOVECOMMAND) -rf 16/keen
        @$(REMOVECOMMAND) -rf 16/Catacomb3D
-       @wmake -h initlibs
+       @wmake -s -h initlibs
 
 initlibs: .symbolic
-       @wmake -h initconfig
-       @wmake -h getlib
+       @wmake -s -h initconfig
+       @wmake -s -h getlib
        @cd 16
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
        @git clone https://github.com/id-Software/wolf3d.git
@@ -553,19 +557,19 @@ getlib: .symbolic
 ##
 xlib: .symbolic
        @cd 16$(DIRSEP)xlib
-       @wmake -h clean
-       @wmake -h all
+       @wmake -s -h clean
+       @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx: .symbolic
        @cd 16$(DIRSEP)xw
 #      @wmake clean
-       @wmake -h all
+       @wmake -s -h all
        @cd $(BUILD_ROOT)
 
 mx_: .symbolic
        @cd 16$(DIRSEP)xw_
-       @wmake -h -f makefile all
+       @wmake -s -h -f makefile all
        @cd $(BUILD_ROOT)
 
 !ifdef __LINUX__