X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=makefile;h=935fbefd25b05c1228af0ba721c1d8c2b4079974;hb=b673eb589dee543a4dd0cbe2eb6fda1994e99aca;hp=797d320e337cb569933e81b9b61e8071be67ba0f;hpb=b4b0b1050a3f3d2e2d9f71a42520bb84bff86a43;p=16.git diff --git a/makefile b/makefile index 797d320e..935fbefd 100755 --- a/makefile +++ b/makefile @@ -22,6 +22,10 @@ # -0 8088/8086 class code generation # -s disable stack overflow checking +# -zk0u translate kanji to unicode... wwww +# -zk0 kanji support~ +# -zkl current codepage + #%.C #192x144 #wwww will add these @@ -42,44 +46,50 @@ OBJ=obj #!endif TARGET_OS = dos -#-zk0u = translate kanji to unicode... wwww -#-zk0 = kanji support~ -#-zkl = current codepage #EXMMTESTDIR=16$(DIRSEP)exmmtest$(DIRSEP) +PDIR=..$(DIRSEP) SRC=src$(DIRSEP) SRCLIB=$(SRC)lib$(DIRSEP) JSMNLIB=$(SRCLIB)jsmn$(DIRSEP) NYANLIB=$(SRCLIB)nyan$(DIRSEP) #EXMMLIB=$(SRCLIB)exmm$(DIRSEP) MODEXLIB=$(SRCLIB)modex16$(DIRSEP) +MODEXLIB_=$(SRCLIB)modex$(DIRSEP) VGMSNDLIB=$(SRCLIB)vgmsnd$(DIRSEP) DOSLIB=$(SRCLIB)doslib$(DIRSEP) 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 -k56000#60000#32768 +SFLAGS=-sg -st -of+ -zu -zdf -zff -zgf -k55808#60000#32768 DFLAGS=-DTARGET_MSDOS=16 -DMSDOS=1 $(SFLAGS) -ZFLAGS=-zk0 -zq -zc -zp8# -zm -CFLAGS=$(IFLAGS) -mh -lr -l=dos -wo# -d2##wwww -OFLAGS=-obmiler -out -oh -ei -zp8 -0 -fpi87 -onac -ol+ -ok####x +ZFLAGS=-zk0 -zc -zp8 $(WCLQ) ## -zm +CFLAGS=$(AFLAGS) $(IFLAGS)-lr -l=dos -wo##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) timer.$(OBJ) -# -#3812intf.$(OBJ) -GFXLIBOBJS = modex16.$(OBJ) bitmap.$(OBJ) planar.$(OBJ) 16text.$(OBJ) bakapee.$(OBJ) scroll16.$(OBJ) 16render.$(OBJ) planar16.$(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) 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 -all: $(EXEC) comp +all: $(EXEC) + +#$(16LIBOBJS) => 16.lib bug.... # #game and bakapi executables @@ -87,8 +97,8 @@ all: $(EXEC) comp 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) $(16LIBOBJS) gfx.lib - wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) $(16LIBOBJS) gfx.lib -fm=bakapi.map +bakapi.exe: bakapi.$(OBJ) gfx.lib modex.lib + wcl $(FLAGS) $(BAKAPIFLAGS) bakapi.$(OBJ) gfx.lib modex.lib -fm=bakapi.map # #Test Executables! # @@ -98,9 +108,9 @@ scroll.$(OBJ): $(SRC)scroll.c wcl $(FLAGS) -c $(SRC)scroll.c tesuto.exe: tesuto.$(OBJ) - wcl -zq -mh -d2 tesuto.$(OBJ) + wcl $(WCLQ) -mh -d2 tesuto.$(OBJ) tesuto.$(OBJ): $(SRC)tesuto.c - wcl -zq -mh -d2 -c $(SRC)tesuto.c + wcl $(WCLQ) -mh -d2 -c $(SRC)tesuto.c #sega.exe: sega.$(OBJ) # wcl $(FLAGS) sega.$(OBJ) @@ -143,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 @@ -261,16 +271,16 @@ 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 + wlib -b $(WLIBQ) doslib.lib $(DOSLIBOBJ) # $(SRCLIB)cpu.lib vgmsnd.lib: $(VGMSNDOBJ) - wlib -b -q vgmsnd.lib $(VGMSNDOBJ) + wlib -b $(WLIBQ) vgmsnd.lib $(VGMSNDOBJ) modex16.$(OBJ): $(SRCLIB)modex16.h $(SRCLIB)modex16.c wcl $(FLAGS) -c $(SRCLIB)modex16.c @@ -281,8 +291,8 @@ bakapee.$(OBJ): $(SRCLIB)bakapee.h $(SRCLIB)bakapee.c 16render.$(OBJ): $(MODEXLIB)16render.h $(MODEXLIB)16render.c wcl $(FLAGS) -c $(MODEXLIB)16render.c -planar16.$(OBJ): $(MODEXLIB)planar16.h $(MODEXLIB)planar16.c - wcl $(FLAGS) -c $(MODEXLIB)planar16.c +16planar.$(OBJ): $(MODEXLIB)16planar.h $(MODEXLIB)16planar.c + wcl $(FLAGS) -c $(MODEXLIB)16planar.c bitmap.$(OBJ): $(SRCLIB)bitmap.h $(SRCLIB)bitmap.c wcl $(FLAGS) -c $(SRCLIB)bitmap.c @@ -302,8 +312,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 @@ -372,17 +382,25 @@ vgmSnd.$(OBJ): $(VGMSNDLIB)vgmSnd.h $(VGMSNDLIB)vgmSnd.c #memory.$(OBJ): $(EXMMLIB)memory.h $(EXMMLIB)memory.c # wcl $(FLAGS) $(MFLAGS) -c $(EXMMLIB)memory.c +c_utils.$(OBJ): $(MODEXLIB_)c_utils.asm + wcl -c $(AFLAGS) $(MODEXLIB_)c_utils.asm +modex.$(OBJ): $(MODEXLIB_)modex.asm + wcl -c $(AFLAGS) $(MODEXLIB_)modex.asm + # #other~ # clean: .symbolic @$(REMOVECOMMAND) $(EXEC) @$(REMOVECOMMAND) *.$(OBJ) - @$(REMOVECOMMAND) *.lib - @wlib -n 16.lib - @wlib -n gfx.lib - @wlib -n doslib.lib - @wlib -n vgmsnd.lib + @$(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 @$(REMOVECOMMAND) *.16B @@ -410,9 +428,63 @@ clean: .symbolic # @echo $(INCLUDE) comp: .symbolic - @upx -9 -qqq $(EXEC) + @upx -9 $(EXEC) + +comq: .symbolic + @upx -9 $(UPXQ) $(EXEC) + +www: .symbolic +# @rm /var/www/$(EXEC) + @cp ./$(EXEC) /var/www/ + @./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) + +#git submodule add +uplibs: .symbolic + @wmake -h updatelibs updatelibs: .symbolic - cd $(JSMNLIB) - git pull - cd ../../../ + @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 + @wmake -h initlibs + +initlibs: .symbolic + @cd $(SRCLIB) + @git clone https://github.com/joncampbell123/doslib.git + @git clone https://github.com/zserge/jsmn.git + @cd $(PDIR)$(PDIR) + +## +## experimental libs +## +xlib: .symbolic + @cd 16/xlib + @wmake -h clean + @wmake -h all + @cd $(PDIR)$(PDIR) + +mx: .symbolic + @cd 16/xw +# @wmake clean + @wmake -h all + @cd $(PDIR)$(PDIR) + +mx_: .symbolic + @cd 16/xw_ + @wmake -h -f makefile all + @cd $(PDIR)$(PDIR)