# -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
# -zk0u translate kanji to unicode... wwww
# -zk0 kanji support~
# -zkl current codepage
+# -zd{f,p} DS floats vs DS pegged to DGROUP
+# -zu SS != DGROUP
+# -zp{1,2,4,8,16} struct packing align.
+# -ei force enums to be type int
+# -wo diagnose problems in overlaid code
# this enables debug output to the serial port.
# 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
#192x144
#wwww will add these
to_os_path=\=/
REMOVECOMMAND=rm -f
COPYCOMMAND=cp -f
+MOVECOMMAND=mv
DIRSEP=/
-OBJ=o
+OBJ=obj
DUMP=cat
DOSLIBMAKE=./make.sh build all
DOSLIBMAKEALL=./buildall.sh build all
to_os_path=/=\
REMOVECOMMAND=del
COPYCOMMAND=copy /y
+MOVECOMMAND=move
DIRSEP=\
OBJ=obj
DUMP=type
SPRI=$(DATADIR)/spri
SRC=src
UTIL=$(SRC)/util
+GITCONFIGDIR=$(UTIL)/git
+SCRIPTBATDIR=$(UTIL)/shbat
SRCLIB=$(SRC)/lib
JSMNLIB=$(SRCLIB)/jsmn
NYANLIB=$(SRCLIB)/nyan
DOSLIB_MEMMODE=dos86$(MEMORYMODE)
# remote host (for sparky4)
-HOSTUSER=wwc001
-HOSTADDR=beta.latech.edu
-HOSTDIR=~/public_html/
+HOSTUSER=sparky4
+HOSTADDR=4ch.mooo.com
+HOSTDIR=/var/www/
+#ssh port
+HOSTPORT=26
+# 2nd remote host (for sparky4)
+HOST2USER=wwc001
+HOST2ADDR=beta.latech.edu
+HOST2DIR=~/public_html/
#ssh port
-HOSTPORT=22
+HOST2PORT=22
#
# quiet flags
#
# compile flags
#
-S_FLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768
-Z_FLAGS=-zk0 -zc -zp8 -zm
-O_FLAGS=-obmilr -oe=24 -outpack -ei -ohnl+ -zp4
-T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536
+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
-DBUGFLAGS=-fm=$^&.mah -fd=$^&
+DBUGFLAGS=-fm=$^&.meh -fd=$^&
CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
!ifeq DEBUGSERIAL 1
CPPFLAGS += -DDEBUGSERIAL
# objects
#
VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(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) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(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_enti.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_wcpu.$(OBJ) 16_timer.$(OBJ) jsmn.$(OBJ) 16_map.$(OBJ) 16text.$(OBJ)
+16LIBOBJS = $(16LIBNOINOBJS) 16_in.$(OBJ)
DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ)
!ifeq DEBUGSERIAL 1
DOSLIBOBJ += 8250.$(OBJ)
# 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 :
wcpu.exe &
db.exe
TESTEXEC = &
+ test.exe &
tesuto.exe &
0.exe &
exmmtest.exe &
vgmtest.exe &
- scroll.exe &
zcroll.exe &
inputest.exe &
- vrstest.exe
+ vrstest.exe &
+ maptest.exe
TESTEXEC2 = &
- maptest.exe &
+ pcxtest.exe &
+ scroll.exe &
fmemtest.exe &
fonttest.exe &
fontgfx.exe &
- test.exe &
test0.exe &
- pcxtest.exe &
- pcxtest2.exe &
$(EXTERNTESTEXEC)
+TESTEXEC3= &
+ pcxtest2.exe
UTILEXEC = &
palettel.exe &
+ palllist.exe &
palettec.exe
+!ifdef __LINUX__
+SPRIUTILEXEC = &
+ pcx2vrl &
+ pcxsscut &
+ vrl2vrs &
+ vrsdump
+#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)
#
fonttest.exe: fonttest.$(OBJ) gfx.lib
#fonttes0.exe: fonttes0.$(OBJ) $(16LIB)
fontgfx.exe: fontgfx.$(OBJ) gfx.lib $(DOSLIB)
-inputest.exe: inputest.$(OBJ) $(16LIB) $(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)
#vgacamm.exe: vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIB)
-palettec.exe: palettec.$(OBJ) gfx.lib $(DOSLIB)
-palettel.exe: palettel.$(OBJ) gfx.lib $(DOSLIB)
+palettec.exe: palettec.$(OBJ) gfx.lib $(DOSLIB)
+palettel.exe: palettel.$(OBJ) gfx.lib $(DOSLIB)
+palllist.exe: palllist.$(OBJ) gfx.lib $(DOSLIB) ll.$(OBJ)
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)
+maptest.exe: maptest.$(OBJ) 16_map.$(OBJ) 16_head.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
fmemtest.exe: fmemtest.$(OBJ)
exmmtest.exe: exmmtest.$(OBJ) $(16LIB) $(DOSLIB)
-vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB)
+vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) $(DOSLIB) gfx.lib
db.exe: db.$(OBJ)
wcpu.exe: wcpu.$(OBJ) $(16LIB) $(DOSLIB)
#vgacamm.$(OBJ):$(SRC)/vgacamm.c $(SRCLIB)/16_vl.h
#planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/16_vl.h
pcxtest2.$(OBJ):$(SRC)/pcxtest2.c $(SRCLIB)/16_vl.h
-palettec.$(OBJ):$(SRC)/palettec.c
-palettel.$(OBJ):$(SRC)/palettel.c
+palettec.$(OBJ): $(SRC)/palettec.c
+palettel.$(OBJ): $(SRC)/palettel.c
+palllist.$(OBJ): $(SRC)/palllist.c
maptest.$(OBJ):$(SRC)/maptest.c $(SRCLIB)/16_vl.h
#emmtest.$(OBJ):$(SRC)/emmtest.c
#emsdump.$(OBJ):$(SRC)/emsdump.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
cd $(DOSLIB_JOYSTICK:$(to_os_path)) && $(DOSLIBMAKE) $(DOSLIB_MEMMODE) && cd $(BUILD_ROOT)
$(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.$(OBJ): $(SRCLIB)/16_vl.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
16planar.$(OBJ):$(MODEXLIB16)/16planar.c $(MODEXLIB16)/16planar.h
16_vrs.$(OBJ): $(SRCLIB)/16_vrs.c $(SRCLIB)/16_vrs.h $(DOSLIB)
-16_sprit.$(OBJ):$(SRCLIB)/16_sprit.c $(SRCLIB)/16_sprit.h
+16_spri.$(OBJ):$(SRCLIB)/16_spri.c $(SRCLIB)/16_spri.h
bitmap.$(OBJ): $(SRCLIB)/bitmap.c $(SRCLIB)/bitmap.h
planar.$(OBJ): $(SRCLIB)/planar.c $(SRCLIB)/planar.h
scroll16.$(OBJ):$(SRCLIB)/scroll16.c $(SRCLIB)/scroll16.h
16text.$(OBJ): $(SRCLIB)/16text.c $(SRCLIB)/16text.h
+16_enti.$(OBJ): $(SRCLIB)/16_enti.c $(SRCLIB)/16_enti.h
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_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_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
#memory.$(OBJ):$(EXMMLIB)/memory.c $(EXMMLIB)/memory.h
c_utils.$(OBJ):$(MODEXLIB)/c_utils.asm
modex.$(OBJ): $(MODEXLIB)/modex.asm
+ll.$(OBJ): $(SRCLIB)/ll.c $(SRCLIB)/ll.h
#
#other~
#
clean: .symbolic
@if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
- @for %f in ($(EXEC)) do @if exist %f $(REMOVECOMMAND) %f
+ @wmake -h initscript
+ @for %f in ($(ALLEXEC)) do @if exist %f $(REMOVECOMMAND) %f
!ifdef __LINUX__
- @rm *.LIB
+ @if exist *.LIB $(REMOVECOMMAND) *.LIB
@. src/util/bcexmm.sh
- @rm *.EXE
+ @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 vrs
!else
@if exist *.o $(REMOVECOMMAND) *.o
!endif
@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 *.16W $(REMOVECOMMAND) *.16W
-# @if exist *.16B $(REMOVECOMMAND) *.16B
-
+ @if exist TC*.SWP $(REMOVECOMMAND) TC*.SWP
+!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)
nuke: .symbolic
@wmake clean
+ @wmake backupscript
@wmake cldl
@wmake all
@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
+
+initconfig: .symbolic
+ @$(COPYCOMMAND) $(GITCONFIGDIR)/git_con.fig .git/config
+ @$(COPYCOMMAND) $(GITCONFIGDIR)/git_modu.les .gitmodules
+ @$(COPYCOMMAND) $(GITCONFIGDIR)/git_igno.re .gitignore
+
+
+backupscript: .symbolic
+ @if exist *.bat $(MOVECOMMAND) *.bat $(SCRIPTBATDIR)/
+ @if exist *.sh $(MOVECOMMAND) *.sh $(SCRIPTBATDIR)/
+!ifdef __LINUX__
+ @if exist *.BAT $(MOVECOMMAND) *.BAT $(SCRIPTBATDIR)/
+ @if not exist ud.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/ud.sh ./
+!endif
+ @if not exist wbuild.sh $(COPYCOMMAND) $(SCRIPTBATDIR)/wbuild.sh ./
+ @if not exist WBUILD.BAT $(COPYCOMMAND) $(SCRIPTBATDIR)/WBUILD.BAT ./
+
+initscript: .symbolic
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.bat ./
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.sh ./
+!ifdef __LINUX__
+ @$(COPYCOMMAND) $(SCRIPTBATDIR)/*.BAT ./
+!endif
+
comp: .symbolic
@*upx -9 $(EXEC)
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*
+ @$(REMOVECOMMAND) /var/www/*.zip.zi*
@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
wwwext: .symbolic
+ @wmake -h wwwext1
+ @wmake -h wwwext2
+
+wwwext1: .symbolic
####----@ssh -p $(HOSTPORT) $(HOSTUSER)@$(HOSTADDR) 'rm -f $(HOSTDIR)/16/*exe*'
+ #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/data.zip.* $(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/data.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
getwww: .symbolic
*x4get.bat $(EXEC)
##
#git submodule add <repo>
mkdl: .symbolic
- @cd $(DOSLIB:$(to_os_path))
+ @cd $(DOSLIBDIR:$(to_os_path))
@$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE)
@cd $(BUILD_ROOT)
cldl: .symbolic
- @cd $(DOSLIB:$(to_os_path))
+ @cd $(DOSLIBDIR:$(to_os_path))
@$(DOSLIBMAKEALL) $(DOSLIB_MEMMODE) clean
@cd $(BUILD_ROOT)
@wmake -h initlibs
initlibs: .symbolic
- @$(COPYCOMMAND) git_con.fig .git/config
- @$(COPYCOMMAND) git_modu.les .gitmodules
- @$(COPYCOMMAND) git_igno.re .gitignore
+ @wmake -h initconfig
@wmake -h getlib
@cd 16
@git clone https://github.com/FlatRockSoft/CatacombApocalypse.git
@wmake -h -f makefile all
@cd $(BUILD_ROOT)
+!ifdef __LINUX__
vrs: .symbolic
+$(SPRIUTILEXEC):
@cd $(DOSLIB_VGA:$(to_os_path))
#@make clean
@make all
- @mv pcx2vrl $(BUILD_ROOT)$(DIRSEP)
- @mv pcxsscut $(BUILD_ROOT)$(DIRSEP)
- @mv vrl2vrs $(BUILD_ROOT)$(DIRSEP)
- @mv vrsdump $(BUILD_ROOT)$(DIRSEP)
+ @for %f in ($(SPRIUTILEXEC)) do @if exist %f $(COPYCOMMAND) %f $(BUILD_ROOT)#$(DIRSEP)
@cd $(BUILD_ROOT)
+!endif
projects / 16.git / blobdiff