__seguse.txt added to show _seg usage also OpenVGMFile needs to be ported to 16_snd...

[16.git] / makefile

diff --git a/makefile b/makefile
index c396e4c6c41ff014c5294423adf1b90a6f652c77..591a4445ca25af7feb8fcfa87e61a757a25fc85c 100755 (executable)
--- a/makefile
+++ b/makefile
@@ -9,7 +9,6 @@
 # -oe - expand user functions inline (-oe=20 is default, adds lots of code)
 # -oh  Enable repeated optimizations
 # -oi  generate certain lib funcs inline
-# -oi  +Set max inline depth (C++ only, use -oi for C)
 # -ok  Flowing of register save into function flow graph
 # -ol  loop optimizations
 # -ol+ loop optimizations plus unrolling
@@ -32,6 +31,8 @@
 # serial output is plain text ASCII.
 DEBUGSERIAL=1
 
+DELLOGFILE=1
+
 #192x144
 #wwww will add these
 !ifdef __LINUX__
@@ -64,6 +65,7 @@ DATADIR=data$(DIRSEP)
 SPRI=$(DATADIR)/spri
 SRC=src
 UTIL=$(SRC)/util
+GITCONFIGDIR=$(UTIL)/git
 SRCLIB=$(SRC)/lib
 JSMNLIB=$(SRCLIB)/jsmn
 NYANLIB=$(SRCLIB)/nyan
@@ -106,10 +108,10 @@ UPXQ=-qqq
 #
 S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
 Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-opmilr -oe=24 -outback -ei -ohnl+                             -zp4
+O_FLAGS=-opnr -oe=24 -oil+ -outback -ohm                               -zp4##-ei
 T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1 -fo=.$(OBJ) ##-e=65536
 
-DBUGFLAGS=-fm=$^&.mah -fd=$^&
+DBUGFLAGS=-fm=$^&.meh -fd=$^&
 CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
 !ifeq DEBUGSERIAL 1
 CPPFLAGS += -DDEBUGSERIAL
@@ -125,8 +127,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)
-16LIBNOINOBJS = 16_mm.$(OBJ) 16_pm.$(OBJ) 16_ca.$(OBJ) 16_tail.$(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)
-16LIBOBJS = $(16LIBNOINOBJS) 16_in.$(OBJ)
+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)
 DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
 !ifeq DEBUGSERIAL 1
 DOSLIBOBJ += 8250.$(OBJ)
@@ -157,10 +158,10 @@ DOSLIB=doslib.lib
 #      Default make rules
 #
 .c.$(OBJ):
-       *wcl $(CFLAGS) $(extra_$^&_obj_opts)            $(CPPFLAGS) -c $[@
+       *wcl $(CFLAGS)   $(extra_$^&_obj_opts)          $(CPPFLAGS) -c $[@
 
 .asm.$(OBJ):
-       *wcl $(AFLAGS) $(extra_$^&_obj_opts)            -c $[@
+       *wcl $(AFLAGS)   $(extra_$^&_obj_opts)          -c $[@
 
 #CFLAGS is neccessary here
 .$(OBJ).exe :
@@ -207,16 +208,25 @@ SPRIUTILEXEC = &
        pcxsscut &
        vrl2vrs &
        vrsdump
-#UTILEXEC += $(SPRIUTILEXEC)
+UTILEXEC += $(SPRIUTILEXEC)
 !endif
 
 EXEC = &
        16.exe &
        bakapi.exe &
-       $(UTILEXEC) &
        $(TESTEXEC)
 
-all: $(EXEC) $(EXTERNTESTEXEC)
+!ifdef __LINUX__
+EXEC += $(SPRIUTILEXEC)
+!endif
+
+ALLEXEC = &
+       $(EXEC) &
+       $(UTILEXEC) &
+       $(TESTEXEC2) &
+       $(TESTEXEC3)
+
+all: $(EXEC)
 testexec: $(EXEC) $(TESTEXEC2)
 
 #
@@ -243,7 +253,6 @@ 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) $(DOSLIB) $(16LIBNOINOBJS) 16_in_.$(OBJ)
 #sountest.exe: sountest.$(OBJ) $(16LIB)
 pcxtest.exe:   pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
 vrstest.exe:   vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
@@ -284,7 +293,6 @@ 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
@@ -339,7 +347,6 @@ 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_.$(OBJ):  $(SRCLIB)/16_in_.c $(SRCLIB)/16_in_.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
@@ -364,12 +371,13 @@ ll.$(OBJ):                $(SRCLIB)/ll.c  $(SRCLIB)/ll.h
 #
 clean: .symbolic
        @if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
-       @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
+       @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !ifdef __LINUX__
        @if exist *.LIB $(REMOVECOMMAND) *.LIB
        @. src/util/bcexmm.sh
        @if exist *.EXE $(REMOVECOMMAND) *.EXE
        @if exist *.OBJ $(REMOVECOMMAND) *.OBJ
+       @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(REMOVECOMMAND) %f
 !else
        @if exist *.o $(REMOVECOMMAND) *.o
 !endif
@@ -382,13 +390,15 @@ clean: .symbolic
        @if exist *.smp $(REMOVECOMMAND) *.smp
        @if exist *.SMP $(REMOVECOMMAND) *.SMP
        @if exist *.hed $(REMOVECOMMAND) *.hed
-       @if exist *.mah $(REMOVECOMMAND) *.mah
-       @if exist *.MAH $(REMOVECOMMAND) *.MAH
+       @if exist *.meh $(REMOVECOMMAND) *.meh
+       @if exist *.MEH $(REMOVECOMMAND) *.MEH
        @if exist *.err $(REMOVECOMMAND) *.err
        @if exist TC*.SWP $(REMOVECOMMAND) TC*.SWP
-#      @if exist *.16W $(REMOVECOMMAND) *.16W
-#      @if exist *.16B $(REMOVECOMMAND) *.16B
-
+!ifeq DELLOGFILE 1
+       @if exist *.16W $(REMOVECOMMAND) *.16W
+       @if exist *.16B $(REMOVECOMMAND) *.16B
+       @if exist *.L16 $(REMOVECOMMAND) *.L16
+!endif
 #      @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC)
 #      @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB)
 #      @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB)
@@ -404,9 +414,9 @@ nuke: .symbolic
        @wmake comp
 
 backupconfig: .symbolic
-       @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig
-       @$(COPYCOMMAND) .gitmodules git_modu.les
-       @$(COPYCOMMAND) .gitignore git_igno.re
+       @$(COPYCOMMAND) .git$(DIRSEP)config $(GITCONFIGDIR)git_con.fig
+       @$(COPYCOMMAND) .gitmodules $(GITCONFIGDIR)git_modu.les
+       @$(COPYCOMMAND) .gitignore $(GITCONFIGDIR)git_igno.re
 
 comp: .symbolic
        @*upx -9 $(EXEC)
@@ -416,9 +426,10 @@ comq: .symbolic
 
 www: .symbolic
        @for %f in (/var/www/$(EXEC)) do @if exist /var/www/%f $(REMOVECOMMAND) /var/www/%f
-       @$(REMOVECOMMAND) /var/www/*.exe.zip*
+       @$(REMOVECOMMAND) /var/www/*.exe.zi*
        @for %f in ($(EXEC)) do @if exist %f @$(COPYCOMMAND) %f /var/www/
        @./src/util/z.sh $(EXEC) $(EXEC)
+       @./src/util/z.sh data data
        @wmake -h wwwext
 
 wwwext: .symbolic
@@ -430,15 +441,18 @@ wwwext1: .symbolic
        #4ch.mooo.com
        @scp -r -P $(HOSTPORT) *.exe $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
        @scp -r -P $(HOSTPORT) *get.bat $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
-       @scp -r -P $(HOSTPORT) /var/www/*.exe.zip.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
-       @scp -r -P $(HOSTPORT) $(DATADIR)spri.zip $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+       @scp -r -P $(HOSTPORT) /var/www/*.exe.zi.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+       #@scp -r -P $(HOSTPORT) $(DATADIR)spri.zip $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+       @scp -r -P $(HOSTPORT) /var/www/data.zi.* $(HOSTUSER)@$(HOSTADDR):$(HOSTDIR)/16/
+
 
 wwwext2: .symbolic
        #beta.latech.edu
        @scp -r -P $(HOST2PORT) *.exe $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
        @scp -r -P $(HOST2PORT) *get.bat $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
-       @scp -r -P $(HOST2PORT) /var/www/*.exe.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
-       @scp -r -P $(HOST2PORT) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       @scp -r -P $(HOST2PORT) /var/www/*.exe.zi.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       #@scp -r -P $(HOST2PORT) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+       @scp -r -P $(HOST2PORT) /var/www/data.zi.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
 
 getwww: .symbolic
        *x4get.bat $(EXEC)
@@ -478,9 +492,9 @@ reinitlibs: .symbolic
        @wmake -h initlibs
 
 initlibs: .symbolic
-       @$(COPYCOMMAND) git_con.fig .git/config
-       @$(COPYCOMMAND) git_modu.les .gitmodules
-       @$(COPYCOMMAND) git_igno.re .gitignore
+       @$(COPYCOMMAND) $(GITCONFIGDIR)git_con.fig .git/config
+       @$(COPYCOMMAND) $(GITCONFIGDIR)git_modu.les .gitmodules
+       @$(COPYCOMMAND) $(GITCONFIGDIR)git_igno.re .gitignore
        @wmake -h getlib
        @cd 16
        @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git