X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=df7edd64a3e54c557d3befc258f492af651d2e1d;hb=a93af9fe8568d39b5e3a732e035151ef94fae634;hp=9931d048491af6a74839a0a9873ccbf6f1b14458;hpb=f8457e6804d0b1cae67ad1860c663c80ba53364a;p=16.git diff --git a/makefile b/makefile index 9931d048..df7edd64 100755 --- a/makefile +++ b/makefile @@ -40,14 +40,11 @@ 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) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) @@ -57,44 +54,50 @@ 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 +WCLQ=-zq $(WLIBQ) +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 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) -ZFLAGS=-zk0 -zc -zp8# -zq ## -zm -CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##wwww +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 FLAGS=$(CFLAGS) $(OFLAGS) $(DFLAGS) $(ZFLAGS) -DOSLIBEXMMOBJ = himemsys.$(OBJ) emm.$(OBJ) +#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) timer.$(OBJ) -# -#3812intf.$(OBJ) -GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) 16planar.$(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) + +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 +EXEC = 16.exe bakapi.exe $(TESTEXEC) tesuto.exe -all: $(EXEC) +all: $(EXEC) joytest.exe +#$(16LIBOBJS) => 16.lib bug.... # #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 -bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib -#$(16LIBOBJS) - 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.map +#modex.lib # #Test Executables! # @@ -103,15 +106,16 @@ scroll.exe: scroll.$(OBJ) mapread.$(OBJ) jsmn.$(OBJ) $(16LIBOBJS) gfx.lib scroll.$(OBJ): $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c -tesuto.exe: tesuto.$(OBJ) - wcl -zq -mh -d2 tesuto.$(OBJ) -tesuto.$(OBJ): $(SRC)tesuto.c - wcl -zq -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 +# 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 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 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 @@ -149,11 +153,11 @@ tsthimem.exe: tsthimem.$(OBJ) $(16LIBOBJS) $(DOSLIBEXMMOBJ) pcxtest.exe: pcxtest.$(OBJ) gfx.lib wcl $(FLAGS) pcxtest.$(OBJ) gfx.lib -fm=pcxtest.map -palettec.exe: palettec.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) palettec.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettec.map +palettec.exe: palettec.$(OBJ) gfx.lib #$(16LIBOBJS) + wcl $(FLAGS) palettec.$(OBJ) gfx.lib -fm=palettec.map #$(16LIBOBJS) -palettel.exe: palettel.$(OBJ) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) palettel.$(OBJ) $(16LIBOBJS) gfx.lib -fm=palettel.map +palettel.exe: palettel.$(OBJ) gfx.lib #$(16LIBOBJS) + wcl $(FLAGS) palettel.$(OBJ) gfx.lib -fm=palettel.map #$(16LIBOBJS) pcxtest2.exe: pcxtest2.$(OBJ) gfx.lib wcl $(FLAGS) pcxtest2.$(OBJ) gfx.lib -fm=pcxtest2.map @@ -267,16 +271,33 @@ vgmtest.$(OBJ): $(SRC)vgmtest.c #non executable objects libraries # 16.lib: $(16LIBOBJS)# doslib.lib vgmsnd.lib - wlib -b -q $(16LIBOBJS) $(16LIBOBJS)# doslib.lib vgmsnd.lib + wlib -b $(WLIBQ) 16.lib $(16LIBOBJS)# doslib.lib vgmsnd.lib gfx.lib: $(GFXLIBOBJS) - wlib -b -q gfx.lib $(GFXLIBOBJS) + wlib -b $(WLIBQ) gfx.lib $(GFXLIBOBJS) -doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib - wlib -b -q doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib +#doslib.lib: $(DOSLIBOBJ) # $(SRCLIB)cpu.lib +# wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib vgmsnd.lib: $(VGMSNDOBJ) - wlib -b -q 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)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 @@ -308,8 +329,8 @@ wcpu.$(OBJ): $(WCPULIB)wcpu.h $(WCPULIB)wcpu.c mapread.$(OBJ): $(SRCLIB)mapread.h $(SRCLIB)mapread.c wcl $(FLAGS) -c $(SRCLIB)mapread.c -timer.$(OBJ): $(SRCLIB)timer.h $(SRCLIB)timer.c - wcl $(FLAGS) -c $(SRCLIB)timer.c +16_timer.$(OBJ): $(SRCLIB)16_timer.h $(SRCLIB)16_timer.c + wcl $(FLAGS) -c $(SRCLIB)16_timer.c 16_in.$(OBJ): $(SRCLIB)16_in.h $(SRCLIB)16_in.c wcl $(FLAGS) -c $(SRCLIB)16_in.c @@ -388,15 +409,14 @@ 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 16.lib - @wlib -n gfx.lib - @wlib -n doslib.lib - @wlib -n vgmsnd.lib + @wlib -n $(WLIBQ) 16.lib + @wlib -n $(WLIBQ) gfx.lib + @wlib -n $(WLIBQ) vgmsnd.lib @$(REMOVECOMMAND) *.16 @$(REMOVECOMMAND) *.16W @$(REMOVECOMMAND) *.16B @@ -412,7 +432,11 @@ clean: .symbolic @$(REMOVECOMMAND) *.MAP @$(REMOVECOMMAND) *.map @$(REMOVECOMMAND) *.err - @$(COPYCOMMAND) .git/config git_con.fig + @$(COPYCOMMAND) .git$(DIRSEP)config git_con.fig + @$(COPYCOMMAND) .gitmodules git_modu.les + @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) @@ -425,45 +449,68 @@ clean: .symbolic comp: .symbolic @upx -9 $(EXEC) -## @upx -9 -qqq x-demo.exe +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*" + #@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/ + +getwww: .symbolic + @x4get.bat $(EXEC) + +## +## External library management~ ^^ +## #git submodule add -uplibs: .symbolic - @wmake updatelibs +mkdl: .symbolic + @cd $(DOSLIB) + @./buildall.sh + @cd $(PDIR)$(PDIR)$(PDIR) -updatelibs: .symbolic +uplibs: .symbolic @cd $(JSMNLIB) @git pull - @cd ../../../ + @cd $(PDIR)$(PDIR)$(PDIR) @cd $(DOSLIB) @git pull - @./buildall.sh - @cd ../../../ + @cd $(PDIR)$(PDIR)$(PDIR) + +reinitlibs: .symbolic + @rm -rf $(SRCLIB)doslib + @rm -rf $(SRCLIB)jsmn + #@mkdir $(SRCLIB)doslib + #@mkdir $(SRCLIB)jsmn + @wmake -h initlibs initlibs: .symbolic - @cd src/lib + @cp git_modu.les .gitmodules + @cd $(SRCLIB) @git clone https://github.com/joncampbell123/doslib.git @git clone https://github.com/zserge/jsmn.git - @cd ../../ + @cd $(PDIR)$(PDIR) +## +## experimental libs +## xlib: .symbolic - @cd 16/xlib - @wmake clean - @wmake all - @cd ../../ + @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 all - @cd ../../ + @wmake -h all + @cd $(PDIR)$(PDIR) mx_: .symbolic - @cd 16/xw_ - @wmake -f makefile all - @cd ../../ - -www: .symbolic - @rm -f /var/www/$(EXEC) - @cp -f $(EXEC) /var/www/ - @scp -r -P 26 *.exe 4ch.mooo.com:/var/www/16/ + @cd 16$(DIRSEP)xw_ + @wmake -h -f makefile all + @cd $(PDIR)$(PDIR)