X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=3e7cfb2682c7acf6cc6af877acb10ca868507b73;hb=b361c338043499d7bb66f69027edea4ebe18f052;hp=42630f87d81d18a7bf0af271ec2189e12aed1395;hpb=ebccc11c46a79148eff48fe3ada319318cb24a38;p=16.git diff --git a/makefile b/makefile index 42630f87..3e7cfb26 100755 --- a/makefile +++ b/makefile @@ -26,6 +26,12 @@ # -zk0 kanji support~ # -zkl current codepage +# 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 + #%.C #192x144 #wwww will add these @@ -34,11 +40,13 @@ REMOVECOMMAND=rm -f COPYCOMMAND=cp -f DIRSEP=/ OBJ=o +DUMP=cat !else REMOVECOMMAND=del COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj +DUMP=type !endif TARGET_OS = dos @@ -59,135 +67,151 @@ DOSLIB=$(SRCLIB)doslib$(DIRSEP) DOSLIBDIR=$(SRCLIB)doslib WCPULIB=$(SRCLIB)wcpu$(DIRSEP) +# +# quiet flags +# WLIBQ=-q WCLQ=-zq $(WLIBQ) UPXQ=-qqq +# +# compile flags +# AFLAGS=-mh -0 -d1 -16FLAGS=-fh=16.hed -BAKAPIFLAGS=-fh=bakapi.hed -SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#55808#60000 +SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k32768#54096#60000 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) -ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm -CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww -OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok####x +ZFLAGS=-zk0 -zc -zp8 -zm $(WCLQ) +LFLAGS=-lr -l=dos +CFLAGS=$(AFLAGS) $(IFLAGS) -wo -i$(DOSLIB) $(LFLAGS) +OFLAGS=-obmilr -oe=24 -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok####x FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) - -#DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) +# +# objects +# VGMSNDOBJ = vgmSnd.$(OBJ) 16_snd.$(OBJ) DOSLIBOBJ = adlib.$(OBJ) 8254.$(OBJ) 8259.$(OBJ) dos.$(OBJ) cpu.$(OBJ) -16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ) - -GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS) - +16LIBOBJS = 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_dbg.$(OBJ) kitten.$(OBJ) 16_hc.$(OBJ) 16_timer.$(OBJ) +GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) $(DOSLIBLIBS) 16_vrs.$(OBJ) 16_sprite.$(OBJ) +#planar.$(OBJ) 16planar.$(OBJ) DOSLIBLIBS=$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib -TESTEXEC = exmmtest.exe test.exe pcxtest.exe pcxtest2.exe test2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe planrpcx.exe -# tsthimem.exe -#testemm.exe testemm0.exe fonttes0.exe miditest.exe sega.exe sountest.exe -EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe +!ifeq DEBUGSERIAL 1 +FLAGS += -DDEBUGSERIAL +DOSLIBOBJ += 8250.$(OBJ) +DOSLIBLIBS += $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib +!endif + +TESTEXEC = test.exe test0.exe pcxtest.exe pcxtest2.exe palettec.exe maptest.exe fmemtest.exe fonttest.exe fontgfx.exe scroll.exe vgmtest.exe inputest.exe palettel.exe exmmtest.exe vrstest.exe +#planrpcx.exe test2.exe +EXEC = 16.exe bakapi.exe tesuto.exe 0.exe $(TESTEXEC) -all: $(EXEC) joytest.exe +all: $(EXEC) joytest.exe +#16.lib => $(16LIBOBJS) bug.... +16LIB=$(16LIBOBJS) +#16LIB=16.lib -#$(16LIBOBJS) => 16.lib bug.... +!ifeq DEBUGSERIAL 1 +16LIBOBJS += $(DOSLIBLIBS) +!endif # #game and bakapi executables # -16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=16.map +16.exe: 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib + wcl $(FLAGS) $(16FLAGS) 16.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=16.mah bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) - wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.map + wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) -fm=bakapi.mah #modex.lib # #Test Executables! # -scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=scroll.map +scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib + wcl $(FLAGS) scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=scroll.mah scroll.$(OBJ): $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c # NOTE: dos86h = 16-bit huge memory model. memory model must match! tesuto.exe: tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib -# %write tmp.cmd option quiet option map=tesuto.map $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe +# %write tmp.cmd option quiet option max=tesuto.mah $(DOSLIB_LDFLAGS_DOS16H) file tesuto.obj name tesuto.exe # %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib # %write tmp.cmd library $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib # @wlink @tmp.cmd + +# +# add this ww to reduce junk www +# +# NTS we have to construct the command line into tmp.cmd because for MS-DOS +# systems all arguments would exceed the pitiful 128 char command line limit +#.C.OBJ: +# %write temp.cmd $(CFLAGS_THIS) $(CFLAGS_CON) $[@ +# wcl @temp.cmd +# wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib tesuto.$(OBJ): $(SRC)tesuto.c wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c -test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) - wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) -fm=test.map - -test2.exe: test2.$(OBJ) gfx.lib - wcl $(FLAGS) test2.$(OBJ) gfx.lib -fm=test2.map +0.exe: 0.$(OBJ) $(DOSLIBLIBS) gfx.lib $(16LIB) + wcl $(FLAGS) $(WCLQ) 0.$(OBJ) $(DOSLIBLIBS) gfx.lib $(16LIB) +0.$(OBJ): $(SRC)0.c + wcl $(FLAGS) $(WCLQ) -c $(SRC)0.c -fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.map +test.exe: test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB) + wcl $(FLAGS) test.$(OBJ) gfx.lib $(DOSLIBLIBS) $(16LIB) -fm=test.mah -#fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS) -# wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS) +#test2.exe: test2.$(OBJ) $(DOSLIBLIBS) gfx.lib +# wcl $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah -fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fontgfx.map +test0.exe: test0.$(OBJ) + wcl $(FLAGS) test0.$(OBJ) -fm=test0.mah -inputest.exe: inputest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.map +fonttest.exe: fonttest.$(OBJ) $(16LIB) gfx.lib + wcl $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah -#sountest.exe: sountest.$(OBJ) $(16LIBOBJS) -# wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS) +#fonttes0.exe: fonttes0.$(OBJ) $(16LIB) +# wcl $(FLAGS) fonttes0.$(OBJ) $(16LIB) -#miditest.exe: miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ) -# wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ) +fontgfx.exe: fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) + wcl $(FLAGS) fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah -tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) - wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.map +inputest.exe: inputest.$(OBJ) $(16LIB) + wcl $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah -#testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -# wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) - -#testemm0.exe: testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -# wcl $(FLAGS) testemm0.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) +#sountest.exe: sountest.$(OBJ) $(16LIB) +# wcl $(FLAGS) sountest.$(OBJ) $(16LIB) pcxtest.exe: pcxtest.$(OBJ) gfx.lib - wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map - -palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS) - wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS) + wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah -palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS) - wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS) +vrstest.exe: vrstest.$(OBJ) gfx.lib $(16LIB) + wcl $(FLAGS) vrstest.$(OBJ) gfx.lib $(16LIB) -fm=vrstest.mah -pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib - wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map +palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIB) + wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIB) -planrpcx.exe: planrpcx.$(OBJ) gfx.lib - wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.map +palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIB) + wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIB) -maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib -fm=maptest.map - -#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ) +pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib + wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah -#emmtest.exe: emmtest.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ) +##planrpcx.exe: planrpcx.$(OBJ) gfx.lib +## wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah -#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ) +maptest.exe: maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib + wcl $(FLAGS) maptest.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIB) gfx.lib -fm=maptest.mah -fmemtest.exe: fmemtest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.map +fmemtest.exe: fmemtest.$(OBJ) $(16LIB) + wcl $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah -exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.map $(16LIBOBJS) +exmmtest.exe: exmmtest.$(OBJ) 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ) + wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB) +####0000 ./wlink32 @__wcl__.lnk -vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIBOBJS) - wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.map $(16LIBOBJS) - #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.map +vgmtest.exe: vgmtest.$(OBJ) vgmsnd.lib $(16LIB) + wcl $(FLAGS) vgmtest.$(OBJ) vgmsnd.lib -fm=vgmtest.mah $(16LIB) + #====wcl -mc vgmtest.$(OBJ) $(VGMSNDOBJ) -fm=vgmtest.mah # @@ -202,14 +226,20 @@ bakapi.$(OBJ): $(SRC)bakapi.h $(SRC)bakapi.c test.$(OBJ): $(SRC)test.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)test.c -test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)test2.c +#test2.$(OBJ): $(SRC)test2.c $(SRCLIB)modex16.h +# wcl $(FLAGS) -c $(SRC)test2.c + +test0.$(OBJ): $(SRC)test0.c + wcl $(FLAGS) -c $(SRC)test0.c pcxtest.$(OBJ): $(SRC)pcxtest.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)pcxtest.c -planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h - wcl $(FLAGS) -c $(SRC)planrpcx.c +vrstest.$(OBJ): $(SRC)vrstest.c $(SRCLIB)modex16.h + wcl $(FLAGS) -c $(SRC)vrstest.c + +##planrpcx.$(OBJ): $(SRC)planrpcx.c $(SRCLIB)modex16.h +## wcl $(FLAGS) -c $(SRC)planrpcx.c pcxtest2.$(OBJ): $(SRC)pcxtest2.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)pcxtest2.c @@ -223,9 +253,6 @@ palettel.$(OBJ): $(SRC)palettel.c maptest.$(OBJ): $(SRC)maptest.c $(SRCLIB)modex16.h wcl $(FLAGS) -c $(SRC)maptest.c -#maptest0.$(OBJ): $(SRC)maptest0.c# $(SRCLIB)modex16.h -# wcl $(FLAGS) $(MFLAGS) -c $(SRC)maptest0.c - #emmtest.$(OBJ): $(SRC)emmtest.c # wcl $(FLAGS) $(MFLAGS) -c $(SRC)emmtest.c @@ -263,7 +290,7 @@ tsthimem.$(OBJ): $(SRC)tsthimem.c wcl $(FLAGS) -c $(SRC)tsthimem.c exmmtest.$(OBJ): $(SRC)exmmtest.c - wcl $(FLAGS) -c $(SRC)exmmtest.c + wcl $(FLAGS) -c $(SRC)exmmtest.c 16_in.$(OBJ) 16_mm.$(OBJ) wcpu.$(OBJ) 16_head.$(OBJ) 16_ca.$(OBJ) 16_hc.$(OBJ) kitten.$(OBJ) vgmtest.$(OBJ): $(SRC)vgmtest.c wcl $(FLAGS) -c $(SRC)vgmtest.c @@ -278,9 +305,6 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c gfx.lib: $(GFXLIBOBJS) wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) -#doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib -# wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib - vgmsnd.lib: $(VGMSNDOBJ) wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ) @@ -292,8 +316,13 @@ $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu$(DIRSEP)dos86h$(DIRSEP)cpu.lib: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)cpu && .$(DIRSEP)make.sh $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos$(DIRSEP)dos86h$(DIRSEP)dos.lib: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)dos && .$(DIRSEP)make.sh +$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vgatty.lib: + cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga$(DIRSEP)dos86h$(DIRSEP)vga.lib: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga && .$(DIRSEP)make.sh +$(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250$(DIRSEP)dos86h$(DIRSEP)8250.lib: + cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)8250 && .$(DIRSEP)make.sh + joytest.exe: cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)joystick && .$(DIRSEP)make.sh && $(COPYCOMMAND) dos86h$(DIRSEP)test.exe $(PDIR)$(PDIR)$(PDIR)$(PDIR)$(PDIR)joytest.exe #$(DOSLIBLIBS): .symbolic @@ -310,14 +339,20 @@ bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c 16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c wcl $(FLAGS) -c $(MODEXLIB)16render.c -16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c - wcl $(FLAGS) -c $(MODEXLIB)16planar.c +##16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c +## wcl $(FLAGS) -c $(MODEXLIB)16planar.c + +16_vrs.$(OBJ): $(SRCLIB)16_vrs.h $(SRCLIB)16_vrs.c $(DOSLIBLIBS) + wcl $(FLAGS) -c $(SRCLIB)16_vrs.c $(DOSLIBLIBS) +16_sprite.$(OBJ): $(SRCLIB)16_sprite.h $(SRCLIB)16_sprite.c + wcl $(FLAGS) -c $(SRCLIB)16_sprite.c + bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c wcl $(FLAGS) -c $(SRCLIB)bitmap.c -planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c - wcl $(FLAGS) -c $(SRCLIB)planar.c +##planar.$(OBJ): $(SRCLIB)planar.h $(SRCLIB)planar.c +## wcl $(FLAGS) -c $(SRCLIB)planar.c scroll16.$(OBJ): $(SRCLIB)scroll16.h $(SRCLIB)scroll16.c wcl $(FLAGS) -c $(SRCLIB)scroll16.c @@ -343,35 +378,12 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c 16_ca.$(OBJ): $(SRCLIB)16_ca.h $(SRCLIB)16_ca.c wcl $(FLAGS) -c $(SRCLIB)16_ca.c +16_dbg.$(OBJ): $(SRCLIB)16_dbg.h $(SRCLIB)16_dbg.c + wcl $(FLAGS) -c $(SRCLIB)16_dbg.c + midi.$(OBJ): $(SRCLIB)midi.h $(SRCLIB)midi.c wcl $(FLAGS) -c $(SRCLIB)midi.c -# -# doslib stuff -# -adlib.$(OBJ): $(DOSLIB)adlib.h $(DOSLIB)adlib.c - wcl $(FLAGS) -c $(DOSLIB)adlib.c - -8254.$(OBJ): $(DOSLIB)8254.h $(DOSLIB)8254.c - wcl $(FLAGS) -c $(DOSLIB)8254.c - -8259.$(OBJ): $(DOSLIB)8259.h $(DOSLIB)8259.c - wcl $(FLAGS) -c $(DOSLIB)8259.c - -dos.$(OBJ): $(DOSLIB)dos.h $(DOSLIB)dos.c - wcl $(FLAGS) -c $(DOSLIB)dos.c - -cpu.$(OBJ): $(DOSLIB)cpu.h $(DOSLIB)cpu.c - wcl $(FLAGS) -c $(DOSLIB)cpu.c - -himemsys.$(OBJ): $(DOSLIB)himemsys.h $(DOSLIB)himemsys.c - wcl $(FLAGS) -c $(DOSLIB)himemsys.c - -emm.$(OBJ): $(DOSLIB)emm.h $(DOSLIB)emm.c - wcl $(FLAGS) -c $(DOSLIB)emm.c - -# end of doslib stuff - 16_head.$(OBJ): $(SRCLIB)16_head.h $(SRCLIB)16_head.c wcl $(FLAGS) -c $(SRCLIB)16_head.c @@ -392,12 +404,6 @@ vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c wcl $(FLAGS) -c $(VGMSNDLIB)vgmSnd.c #====wcl -c -mc $(VGMSNDLIB)vgmSnd.c -#3812intf.$(OBJ): $(VGMSNDLIB)3812intf.h $(VGMSNDLIB)3812intf.c -# wcl $(FLAGS) -c $(VGMSNDLIB)3812intf.c - -#farjsmn.$(OBJ): $(JSMNLIB)farjsmn.h $(JSMNLIB)farjsmn.c -# wcl $(FLAGS) $(MFLAGS) -c $(JSMNLIB)farjsmn.c - #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c # wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c @@ -411,7 +417,6 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm # clean: .symbolic @$(REMOVECOMMAND) $(EXEC) - @$(REMOVECOMMAND) /var/www/$(EXEC)* @$(REMOVECOMMAND) *.$(OBJ) @$(REMOVECOMMAND) 16.lib @$(REMOVECOMMAND) gfx.lib @@ -431,8 +436,8 @@ clean: .symbolic # @$(REMOVECOMMAND) *.smp @$(REMOVECOMMAND) *.SMP @$(REMOVECOMMAND) *.hed - @$(REMOVECOMMAND) *.MAP - @$(REMOVECOMMAND) *.map + @$(REMOVECOMMAND) *.MAH + @$(REMOVECOMMAND) *.mah @$(REMOVECOMMAND) *.err #@cd $(DOSLIB) #@./buildall.sh clean @@ -450,6 +455,7 @@ clean: .symbolic backupconfig: .symbolic @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig @$(COPYCOMMAND) .gitmodules git_modu.les + @$(COPYCOMMAND) .gitignore git_igno.re comp: .symbolic @upx -9 $(EXEC) @@ -458,16 +464,21 @@ comq: .symbolic @upx -9 $(UPXQ) $(EXEC) www: .symbolic - @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*' - @rm "/var/www/$(EXEC).zip*" + @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe*' + #@rm -f /var/www/$(EXEC)* + @rm -f /var/www/*.exe.zip* #@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP) - @./z.sh $(EXEC) $(EXEC) + @./src/util/z.sh $(EXEC) $(EXEC) @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/ + @scp -r -P 26 x4get.bat 4ch.mooo.com:/var/www/16/ @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/ getwww: .symbolic @x4get.bat $(EXEC) +vomitchan: .symbolic + @$(DUMP) *.err + ## ## External library management~ ^^ ## @@ -488,16 +499,24 @@ uplibs: .symbolic reinitlibs: .symbolic @rm -rf $(SRCLIB)doslib @rm -rf $(SRCLIB)jsmn - #@mkdir $(SRCLIB)doslib - #@mkdir $(SRCLIB)jsmn + @rm -rf 16/CatacombApocalypse + @rm -rf 16/wolf3d + @rm -rf 16/keen @wmake -h initlibs initlibs: .symbolic + @cp git_con.fig .git/config @cp git_modu.les .gitmodules + @cp git_igno.re .gitignore @cd $(SRCLIB) @git clone https://github.com/joncampbell123/doslib.git @git clone https://github.com/zserge/jsmn.git @cd $(PDIR)$(PDIR) + @cd 16 + @git clone https://github.com/FlatRockSoft/CatacombApocalypse.git + @git clone https://github.com/id-Software/wolf3d.git + @git clone https://github.com/keendreams/keen.git + @cd $(PDIR) ## ## experimental libs @@ -519,6 +538,12 @@ mx_: .symbolic @wmake -h -f makefile all @cd $(PDIR)$(PDIR) -ed: .symbolic -@$(DOSLIB)hw$(DIRSEP)vga$(DIRSEP)dos86l$(DIRSEP)pcxsscut -s $(SPRI)ptmp.sht -hc $(SPRI)ptmp.h -hp $(SPRI)demoanim_ptmp_ -i $(DATADIR)ptmp.pcx -p $(SPRI)ptmp.pal -tc 0x84 -y # run from subdirectory where output will not be committed accidentally -@$(DOSLIB)hw$(DIRSEP)vga$(DIRSEP)dos86l$(DIRSEP)vrl2vrs -s $(SPRI)ptmp.sht -hc $(SPRI)ptmps.h -hp $(SPRI)demoanim_ptmp_ -o $(SPRI)ptmp.vrs # run from same subdirectory +vrs: .symbolic + @cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga + #@make clean + @make all + @mv pcx2vrl ../../../../../ + @mv pcxsscut ../../../../../ + @mv vrl2vrs ../../../../../ + @mv vrsdump ../../../../../ + @cd ../../../../../