REMOVECOMMAND=rm -f
COPYCOMMAND=cp -f
DIRSEP=/
-OBJ=o
+OBJ=obj
DUMP=cat
DOSLIBMAKE=./make.sh build all
DOSLIBMAKEALL=./buildall.sh build all
#
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=-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=$^&
CPPFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1
# objects
#
VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ)
-OLDLIBOBJS=bitmap.$(OBJ) 16render.$(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_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)
+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)
+16LIBOBJS = $(16LIBNOINOBJS) 16_in.$(OBJ) 16_enti.$(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 &
maptest.exe
TESTEXEC2 = &
+ pcxtest.exe &
+ scroll.exe &
fmemtest.exe &
fonttest.exe &
fontgfx.exe &
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__.$(OBJ)
#sountest.exe: sountest.$(OBJ) $(16LIB)
pcxtest.exe: pcxtest.$(OBJ) gfx.lib $(DOSLIB) $(16LIB)
vrstest.exe: vrstest.$(OBJ) $(16LIB) 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)
#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
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
@if not exist $(DOSLIBDIR)/buildall.sh wmake -h initlibs
@for %f in ($(EXEC)) 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
!else
@if exist *.o $(REMOVECOMMAND) *.o
@$(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
@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)