X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=86c191bc8c609114e31b487fad04436578b4a4d9;hb=e7fa17ebf9e8c8ce5d08d2fe5da684df58f45910;hp=935fbefd25b05c1228af0ba721c1d8c2b4079974;hpb=42b9296b70b56473fabe57bcb3644baff377b28a;p=16.git diff --git a/makefile b/makefile index 935fbefd..86c191bc 100755 --- a/makefile +++ b/makefile @@ -40,16 +40,14 @@ COPYCOMMAND=copy /y DIRSEP=\ OBJ=obj !endif -#!ifndef INCLUDE -#IN=..$(DIRSEP)..$(DIRSEP)fdos$(DIRSEP)watcom2$(DIRSEP)h -#IFLAGS=-i=$(IN) -#!endif TARGET_OS = dos #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP) PDIR=..$(DIRSEP) SRC=src$(DIRSEP) +DATADIR=data$(DIRSEP) +SPRI=$(DATADIR)$(DIRSEP)spri$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) NYANLIB=$(SRCLIB)nyan$(DIRSEP) @@ -58,6 +56,7 @@ MODEXLIB=$(SRCLIB)modex16$(DIRSEP) MODEXLIB_=$(SRCLIB)modex$(DIRSEP) VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP) DOSLIB=$(SRCLIB)doslib$(DIRSEP) +DOSLIBDIR=$(SRCLIB)doslib WCPULIB=$(SRCLIB)wcpu$(DIRSEP) WLIBQ=-q @@ -67,125 +66,105 @@ UPXQ=-qqq AFLAGS=-mh -0 -d1 16FLAGS=-fh=16.hed BAKAPIFLAGS=-fh=bakapi.hed -SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768 +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##wwww +CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo -i$(DOSLIB)##wwww OFLAGS=-obmiler -out -oh -ei -zp8 -fpi87 -onac -ol+ -ok####x FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) -DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) 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) +GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(OBJ) $(DOSLIBLIBS) -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 +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 -all: $(EXEC) +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 -#$(16LIBOBJS) => 16.lib bug.... +EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe +all: $(EXEC) joytest.exe vrs +#16.lib => $(16LIBOBJS) bug.... +16LIB=$(16LIBOBJS) # #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 modex.lib - wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map +bakapi.exe: bakapi.$(OBJ) gfx.lib $(DOSLIBLIBS) + 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 -tesuto.exe: tesuto.$(OBJ) - wcl $(WCLQ) -mh -d2 tesuto.$(OBJ) -tesuto.$(OBJ): $(SRC)tesuto.c - wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c - -#sega.exe: sega.$(OBJ) -# wcl $(FLAGS) sega.$(OBJ) -#sega.$(OBJ): $(SRC)sega.c -# wcl $(FLAGS) -c $(SRC)sega.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 -fonttest.exe: fonttest.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) fonttest.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fonttest.map - -#fonttes0.exe: fonttes0.$(OBJ) $(16LIBOBJS) -# wcl $(FLAGS) fonttes0.$(OBJ) $(16LIBOBJS) +# 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 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 + wcl $(FLAGS) $(WCLQ) tesuto.$(OBJ) $(DOSLIBLIBS) 16_head.$(OBJ) gfx.lib +tesuto.$(OBJ): $(SRC)tesuto.c + wcl $(FLAGS) $(WCLQ) -c $(SRC)tesuto.c -fontgfx.exe: fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) fontgfx.$(OBJ) $(16LIBOBJS) gfx.lib -fm=fontgfx.map +test.exe: test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) $(DOSLIBLIBS) $(16LIB) + wcl $(FLAGS) test.$(OBJ) gfx.lib 16_in.$(OBJ) 16_head.$(OBJ) $(DOSLIBLIBS) $(16LIB) -fm=test.mah -inputest.exe: inputest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) inputest.$(OBJ) $(16LIBOBJS) -fm=inputest.map +test2.exe: test2.$(OBJ) $(DOSLIBLIBS) gfx.lib + wcl $(FLAGS) test2.$(OBJ) $(DOSLIBLIBS) gfx.lib -fm=test2.mah -#sountest.exe: sountest.$(OBJ) $(16LIBOBJS) -# wcl $(FLAGS) sountest.$(OBJ) $(16LIBOBJS) +fonttest.exe: fonttest.$(OBJ) $(16LIB) gfx.lib + wcl $(FLAGS) fonttest.$(OBJ) $(16LIB) gfx.lib -fm=fonttest.mah -#miditest.exe: miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ) -# wcl $(FLAGS) miditest.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) midi.$(OBJ) +#fonttes0.exe: fonttes0.$(OBJ) $(16LIB) +# wcl $(FLAGS) fonttes0.$(OBJ) $(16LIB) -tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) - wcl $(FLAGS) tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -fm=tsthimem.map +fontgfx.exe: fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) + wcl $(FLAGS) fontgfx.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS) -fm=fontgfx.mah -#testemm.exe: testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) -# wcl $(FLAGS) testemm.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) +inputest.exe: inputest.$(OBJ) $(16LIB) + wcl $(FLAGS) inputest.$(OBJ) $(16LIB) -fm=inputest.mah -#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 + wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.mah -palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS) - wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS) +palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIB) + wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.mah #$(16LIB) -palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS) - wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS) +palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIB) + wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.mah #$(16LIB) pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib - wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map + wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.mah planrpcx.exe: planrpcx.$(OBJ) gfx.lib - wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.map + wcl $(FLAGS) planrpcx.$(OBJ) gfx.lib -fm=planrpcx.mah -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 +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 -#maptest0.exe: maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) maptest0.$(OBJ) fmapread.$(OBJ) farjsmn.$(OBJ) +fmemtest.exe: fmemtest.$(OBJ) $(16LIB) + wcl $(FLAGS) fmemtest.$(OBJ) $(16LIB) -fm=fmemtest.mah -#emmtest.exe: emmtest.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emmtest.$(OBJ) memory.$(OBJ) +exmmtest.exe: exmmtest.$(OBJ) $(16LIB) + wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.mah $(16LIB) -#emsdump.exe: emsdump.$(OBJ) memory.$(OBJ) -# wcl $(FLAGS) $(MFLAGS) emsdump.$(OBJ) memory.$(OBJ) - -fmemtest.exe: fmemtest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) fmemtest.$(OBJ) $(16LIBOBJS) -fm=fmemtest.map - -exmmtest.exe: exmmtest.$(OBJ) $(16LIBOBJS) - wcl $(FLAGS) exmmtest.$(OBJ) -fm=exmmtest.map $(16LIBOBJS) - -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 # @@ -273,15 +252,32 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c 16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib -gfx.lib: $(GFXLIBOBJS) - wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) - -doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib - wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib +gfx.lib: $(GFXLIBOBJS) 16_in.$(OBJ) 16_head.$(OBJ) + wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) 16_in.$(OBJ) 16_head.$(OBJ) vgmsnd.lib: $(VGMSNDOBJ) wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ) +# extdep: +# !include $(DOSLIBDIR)$(DIRSEP)extdep.mak + +# library deps 16-bit huge +$(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 + +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 +# @cd $(DOSLIB) +# @.$(DIRSEP)buildall.sh +# @cd $(PDIR)$(PDIR)$(PDIR) + modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -327,32 +323,6 @@ mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.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 @@ -373,12 +343,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 @@ -392,14 +356,13 @@ modex.$(OBJ): $(MODEXLIB_)modex.asm # clean: .symbolic @$(REMOVECOMMAND) $(EXEC) + @$(REMOVECOMMAND) /var/www/$(EXEC)* @$(REMOVECOMMAND) *.$(OBJ) @$(REMOVECOMMAND) 16.lib @$(REMOVECOMMAND) gfx.lib - @$(REMOVECOMMAND) doslib.lib @$(REMOVECOMMAND) vgmsnd.lib @wlib -n $(WLIBQ) 16.lib @wlib -n $(WLIBQ) gfx.lib - @wlib -n $(WLIBQ) doslib.lib @wlib -n $(WLIBQ) vgmsnd.lib @$(REMOVECOMMAND) *.16 @$(REMOVECOMMAND) *.16W @@ -413,10 +376,12 @@ clean: .symbolic # @$(REMOVECOMMAND) *.smp @$(REMOVECOMMAND) *.SMP @$(REMOVECOMMAND) *.hed - @$(REMOVECOMMAND) *.MAP - @$(REMOVECOMMAND) *.map + @$(REMOVECOMMAND) *.MAH + @$(REMOVECOMMAND) *.mah @$(REMOVECOMMAND) *.err - @$(COPYCOMMAND) .git/config git_con.fig + #@cd $(DOSLIB) + #@./buildall.sh clean + #@cd $(PDIR)$(PDIR)$(PDIR) # @$(COPYCOMMAND) $(SRC)exmmtest.c $(EXMMTESTDIR)$(SRC) # @$(COPYCOMMAND) $(SRCLIB)16_mm.* $(EXMMTESTDIR)$(SRCLIB) # @$(COPYCOMMAND) $(SRCLIB)16_head.* $(EXMMTESTDIR)$(SRCLIB) @@ -427,6 +392,10 @@ clean: .symbolic # @echo $(watcom) # @echo $(INCLUDE) +backupconfig: .symbolic + @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig + @$(COPYCOMMAND) .gitmodules git_modu.les + comp: .symbolic @upx -9 $(EXEC) @@ -434,8 +403,9 @@ comq: .symbolic @upx -9 $(UPXQ) $(EXEC) www: .symbolic -# @rm /var/www/$(EXEC) - @cp ./$(EXEC) /var/www/ + @ssh -p 26 sparky4@4ch.mooo.com 'rm -f /var/www/16/*exe.zip*' + @rm -f /var/www/*.exe.zip* + #@cp ./$(EXEC) $(DIRSEP)var$(DIRSEP)www$(DIRSEP) @./z.sh $(EXEC) $(EXEC) @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/ @scp -r -P 26 /var/www/*.exe.zip.* 4ch.mooo.com:/var/www/16/ @@ -443,48 +413,68 @@ www: .symbolic getwww: .symbolic @x4get.bat $(EXEC) +## +## External library management~ ^^ +## #git submodule add -uplibs: .symbolic - @wmake -h updatelibs +mkdl: .symbolic + @cd $(DOSLIB) + @./buildall.sh + @cd $(PDIR)$(PDIR)$(PDIR) -updatelibs: .symbolic +uplibs: .symbolic @cd $(JSMNLIB) @git pull @cd $(PDIR)$(PDIR)$(PDIR) @cd $(DOSLIB) @git pull - @./buildall.sh @cd $(PDIR)$(PDIR)$(PDIR) reinitlibs: .symbolic @rm -rf $(SRCLIB)doslib @rm -rf $(SRCLIB)jsmn - @mkdir $(SRCLIB)doslib - @mkdir $(SRCLIB)jsmn + @rm -rf 16/CatacombApocalypse + @rm -rf 16/wolf3d @wmake -h initlibs initlibs: .symbolic + @cp git_con.fig .git/config + @cp git_modu.les .gitmodules @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 + @cd $(PDIR) ## ## experimental libs ## xlib: .symbolic - @cd 16/xlib + @cd 16$(DIRSEP)xlib @wmake -h clean @wmake -h all @cd $(PDIR)$(PDIR) mx: .symbolic - @cd 16/xw + @cd 16$(DIRSEP)xw # @wmake clean @wmake -h all @cd $(PDIR)$(PDIR) mx_: .symbolic - @cd 16/xw_ + @cd 16$(DIRSEP)xw_ @wmake -h -f makefile all @cd $(PDIR)$(PDIR) + +vrs: .symbolic + @cd $(DOSLIBDIR)$(DIRSEP)hw$(DIRSEP)vga + #@make clean + @make all + @mv pcx2vrl ../../../../../ + @mv pcxsscut ../../../../../ + @mv vrl2vrs ../../../../../ + @mv vrsdump ../../../../../ + @cd ../../../../../