# -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
REMOVECOMMAND=rm -f
COPYCOMMAND=cp -f
DIRSEP=/
-OBJ=o
+OBJ=obj
DUMP=cat
DOSLIBMAKE=./make.sh build all
DOSLIBMAKEALL=./buildall.sh build all
SPRI=$(DATADIR)/spri
SRC=src
UTIL=$(SRC)/util
+GITCONFIGDIR=$(UTIL)/git
SRCLIB=$(SRC)/lib
JSMNLIB=$(SRCLIB)/jsmn
NYANLIB=$(SRCLIB)/nyan
#
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
-T_FLAGS=-bt=dos -wx -m$(MEMORYMODE) -0 -fpi87 -d1##-fo=.$(OBJ) -e=65536
+O_FLAGS=-opn -oe=24 -oil+ -outback -ohm -zp4##-ei -or
+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) 16_enti.$(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)
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 :
0.exe &
exmmtest.exe &
vgmtest.exe &
- scroll.exe &
zcroll.exe &
inputest.exe &
- pcxtest.exe &
- vrstest.exe
+ vrstest.exe &
+ maptest.exe
TESTEXEC2 = &
- maptest.exe &
+ pcxtest.exe &
+ scroll.exe &
fmemtest.exe &
fonttest.exe &
fontgfx.exe &
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)
#
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
#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)
-palllist.exe: palllist.$(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) $(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)
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
#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
+ @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
!else
@if exist *.o $(REMOVECOMMAND) *.o
!endif
@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)
@$(REMOVECOMMAND) /var/www/*.exe.zip*
@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
+ @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) $(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) $(DATADIR)spri.zip $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
+ @scp -r -P $(HOST2PORT) /var/www/data.zip.* $(HOST2USER)@$(HOST2ADDR):$(HOST2DIR)/16/
getwww: .symbolic
*x4get.bat $(EXEC)
@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