From d7b0b13885659c74da047c5e081e7c1accdf373b Mon Sep 17 00:00:00 2001 From: nmlgc Date: Sun, 2 Jun 2024 04:10:05 +0200 Subject: [PATCH] [Build] Emit all intermediate files into `obj/` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Finally, a clean `bin/` tree. 😌 And as for the additional complexities in the Makefile, well, we're about to get rid of that one anyway. 🚮 Part of P0002, funded by GhostPhanom. --- .gitignore | 1 + Makefile.mak | 93 +++++++++++++++++++++------------------ Tupfile | 74 +++++++++++++++---------------- Tupfile.bat | 120 +++++++++++++++++++++++++-------------------------- build32b.bat | 3 ++ 5 files changed, 152 insertions(+), 139 deletions(-) diff --git a/.gitignore b/.gitignore index a0032806..115426f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ bin/* +obj/ .tup/* !bin/masters.lib Research/**/*.exe diff --git a/Makefile.mak b/Makefile.mak index 454e46ca..641bcb4c 100644 --- a/Makefile.mak +++ b/Makefile.mak @@ -57,8 +57,17 @@ th03:: $(TH03:\=bin\th03\) th04:: $(TH04:\=bin\th04\) th05:: $(TH05:\=bin\th05\) -.obj.com: - tlink /t /3 $** +{obj\th02}.obj{bin\th02}.com: + tlink /t /3 $**, $@ + +{obj\th03}.obj{bin\th03}.com: + tlink /t /3 $**, $@ + +{obj\th04}.obj{bin\th04}.com: + tlink /t /3 $**, $@ + +{obj\th05}.obj{bin\th05}.com: + tlink /t /3 $**, $@ bin\Pipeline\grzview.com: Pipeline\grzview.cpp th01\formats\grz.cpp platform\x86real\pc98\palette.cpp $(CC) $(CFLAGS_OPTIMIZED) -mt -lt -DGAME=1 -nbin\Pipeline\ @&&| @@ -68,29 +77,29 @@ $** bin\th01\zunsoft.com: th01\zunsoft.cpp $(CC) $(CFLAGS) -mt -lt -DGAME=1 -nbin\th01\ $** masters.lib -{th01}.c{bin\th01}.obj: +{th01}.c{obj\th01}.obj: $(CC) $(CFLAGS) -ml -DGAME=1 -n$(@D) -c $** -{th01}.cpp{bin\th01}.obj: +{th01}.cpp{obj\th01}.obj: $(CC) $(CFLAGS) -ml -DGAME=1 -n$(@D) -c $** -bin\th01\op.exe: bin\piloadc.obj th01\op_01.cpp bin\th01\frmdelay.obj bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\ptn_0to1.obj bin\th01\vplanset.obj th01\op_07.cpp bin\th01\grp_text.obj bin\th01\ptn.obj th01\op_09.cpp bin\th01\f_imgd.obj bin\th01\grz.obj bin\th01\op.obj bin\th01\resstuff.obj bin\th01\mdrv2.obj bin\th01\pf.obj +bin\th01\op.exe: obj\piloadc.obj th01\op_01.cpp obj\th01\frmdelay.obj obj\th01\vsync.obj obj\th01\ztext.obj obj\th01\initexit.obj obj\th01\graph.obj obj\th01\ptn_0to1.obj obj\th01\vplanset.obj th01\op_07.cpp obj\th01\grp_text.obj obj\th01\ptn.obj th01\op_09.cpp obj\th01\f_imgd.obj obj\th01\grz.obj obj\th01\op.obj obj\th01\resstuff.obj obj\th01\mdrv2.obj obj\th01\pf.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=1 -DBINARY='O' -nbin\th01\ -eOP.EXE @&&| $** | -bin\th01\reiiden.exe: bin\piloadc.obj th01\main_01.cpp bin\th01\frmdelay.obj bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\ptn_0to1.obj bin\th01\vplanset.obj th01\main_07.cpp bin\th01\ptn.obj th01\main_08.cpp bin\th01\f_imgd.obj bin\th01\grz.obj bin\th01\reiiden.obj th01\main_09.cpp th01\bullet_l.cpp th01\grpinv32.cpp bin\th01\resstuff.obj th01\scrollup.cpp th01\egcrows.cpp th01\pgtrans.cpp th01\2x_main.cpp th01\egcwave.cpp th01\grph1to0.cpp th01\main_14.cpp th01\main_15.cpp bin\th01\mdrv2.obj th01\main_17.cpp th01\main_18.cpp th01\main_19.cpp th01\main_20.cpp th01\main_21.cpp bin\th01\pf.obj th01\main_23.cpp th01\main_24.cpp th01\main_25.cpp th01\main_26.cpp th01\main_27.cpp th01\main_28.cpp th01\main_29.cpp th01\main_30.cpp th01\main_31.cpp th01\main_32.cpp th01\main_33.cpp th01\main_34.cpp th01\main_35.cpp th01\main_36.cpp th01\main_37.cpp th01\main_38.cpp +bin\th01\reiiden.exe: obj\piloadc.obj th01\main_01.cpp obj\th01\frmdelay.obj obj\th01\vsync.obj obj\th01\ztext.obj obj\th01\initexit.obj obj\th01\graph.obj obj\th01\ptn_0to1.obj obj\th01\vplanset.obj th01\main_07.cpp obj\th01\ptn.obj th01\main_08.cpp obj\th01\f_imgd.obj obj\th01\grz.obj obj\th01\reiiden.obj th01\main_09.cpp th01\bullet_l.cpp th01\grpinv32.cpp obj\th01\resstuff.obj th01\scrollup.cpp th01\egcrows.cpp th01\pgtrans.cpp th01\2x_main.cpp th01\egcwave.cpp th01\grph1to0.cpp th01\main_14.cpp th01\main_15.cpp obj\th01\mdrv2.obj th01\main_17.cpp th01\main_18.cpp th01\main_19.cpp th01\main_20.cpp th01\main_21.cpp obj\th01\pf.obj th01\main_23.cpp th01\main_24.cpp th01\main_25.cpp th01\main_26.cpp th01\main_27.cpp th01\main_28.cpp th01\main_29.cpp th01\main_30.cpp th01\main_31.cpp th01\main_32.cpp th01\main_33.cpp th01\main_34.cpp th01\main_35.cpp th01\main_36.cpp th01\main_37.cpp th01\main_38.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=1 -DBINARY='M' -nbin\th01\ -eREIIDEN.EXE @&&| $** | -bin\th01\fuuin.exe: bin\piloadc.obj th01\fuuin_01.cpp bin\th01\input_mf.obj th01\fuuin_02.cpp th01\fuuin_03.cpp th01\fuuin_04.cpp bin\th01\vsync.obj bin\th01\ztext.obj bin\th01\initexit.obj bin\th01\graph.obj bin\th01\grp_text.obj th01\fuuin_10.cpp th01\f_imgd_f.cpp bin\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp bin\th01\mdrv2.obj bin\th01\fuuin.obj +bin\th01\fuuin.exe: obj\piloadc.obj th01\fuuin_01.cpp obj\th01\input_mf.obj th01\fuuin_02.cpp th01\fuuin_03.cpp th01\fuuin_04.cpp obj\th01\vsync.obj obj\th01\ztext.obj obj\th01\initexit.obj obj\th01\graph.obj obj\th01\grp_text.obj th01\fuuin_10.cpp th01\f_imgd_f.cpp obj\th01\vplanset.obj th01\fuuin_11.cpp th01\2x_fuuin.cpp obj\th01\mdrv2.obj obj\th01\fuuin.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=1 -DBINARY='E' -nbin\th01\ -eFUUIN.EXE @&&| $** | -{th02}.c{bin\th02}.obj: +{th02}.c{obj\th02}.obj: $(CC) $(CFLAGS) -ml -DGAME=2 -n$(@D) -c $** -{th02}.cpp{bin\th02}.obj: +{th02}.cpp{obj\th02}.obj: $(CC) $(CFLAGS) -ml -DGAME=2 -n$(@D) -c $** bin\th02\zun_res.com: th02\zun_res1.cpp th02\zun_res2.cpp @@ -98,24 +107,24 @@ bin\th02\zun_res.com: th02\zun_res1.cpp th02\zun_res2.cpp $** | masters.lib -bin\th02\op.exe: th02\op_01.cpp bin\th02\exit_dos.obj bin\th02\zunerror.obj bin\th02\grppsafx.obj bin\th02\op.obj bin\th01\vplanset.obj bin\th02\pi_load.obj bin\th02\grp_rect.obj bin\th02\frmdely2.obj bin\th02\input_rs.obj bin\th02\initop.obj bin\th02\exit.obj bin\th02\snd_mmdr.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th02\snd_load.obj bin\th02\pi_put.obj bin\th02\snd_kaja.obj th02\op_02_3.cpp bin\th02\snd_se_r.obj bin\th02\snd_se.obj bin\th02\frmdely1.obj th02\op_03.cpp bin\th02\globals.obj th02\op_04.cpp th02\op_05.cpp th02\op_music.cpp +bin\th02\op.exe: th02\op_01.cpp obj\th02\exit_dos.obj obj\th02\zunerror.obj obj\th02\grppsafx.obj obj\th02\op.obj obj\th01\vplanset.obj obj\th02\pi_load.obj obj\th02\grp_rect.obj obj\th02\frmdely2.obj obj\th02\input_rs.obj obj\th02\initop.obj obj\th02\exit.obj obj\th02\snd_mmdr.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th02\snd_load.obj obj\th02\pi_put.obj obj\th02\snd_kaja.obj th02\op_02_3.cpp obj\th02\snd_se_r.obj obj\th02\snd_se.obj obj\th02\frmdely1.obj th02\op_03.cpp obj\th02\globals.obj th02\op_04.cpp th02\op_05.cpp th02\op_music.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=2 -nbin\th02\ -eOP.EXE @&&| $** | -bin\th02\main.exe: bin\th02\main.obj bin\th02\tile.obj th02\pointnum.cpp th02\item.cpp th02\hud.cpp th02\player_b.cpp bin\th02\zunerror.obj bin\th02\keydelay.obj th02\main02_1.cpp bin\th01\vplanset.obj bin\th02\pi_load.obj bin\th02\vector.obj bin\th02\frmdely1.obj bin\th02\input_rs.obj bin\th02\exit.obj bin\th02\snd_mmdr.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th02\snd_dlyv.obj bin\th02\snd_load.obj th02\mpn_l_i.cpp bin\th02\initmain.obj bin\th02\pi_put.obj bin\th02\snd_kaja.obj bin\th02\snd_dlym.obj bin\th02\snd_se_r.obj bin\th02\snd_se.obj th02\main_03.cpp th02\hud_ovrl.cpp th02\dialog.cpp th02\boss_5.cpp +bin\th02\main.exe: obj\th02\main.obj obj\th02\tile.obj th02\pointnum.cpp th02\item.cpp th02\hud.cpp th02\player_b.cpp obj\th02\zunerror.obj obj\th02\keydelay.obj th02\main02_1.cpp obj\th01\vplanset.obj obj\th02\pi_load.obj obj\th02\vector.obj obj\th02\frmdely1.obj obj\th02\input_rs.obj obj\th02\exit.obj obj\th02\snd_mmdr.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th02\snd_dlyv.obj obj\th02\snd_load.obj th02\mpn_l_i.cpp obj\th02\initmain.obj obj\th02\pi_put.obj obj\th02\snd_kaja.obj obj\th02\snd_dlym.obj obj\th02\snd_se_r.obj obj\th02\snd_se.obj th02\main_03.cpp th02\hud_ovrl.cpp th02\dialog.cpp th02\boss_5.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=2 -nbin\th02\ -eMAIN.EXE @&&| $** | -bin\th02\maine.exe: th02\end.cpp bin\th02\maine.obj bin\th02\grppsafx.obj bin\th02\keydelay.obj bin\th01\vplanset.obj bin\th02\pi_load.obj bin\th02\frmdely1.obj th02\maine022.cpp bin\th02\input_rs.obj bin\th02\exit.obj bin\th02\snd_mmdr.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th02\snd_load.obj bin\th02\initmain.obj bin\th02\pi_put.obj bin\th02\snd_kaja.obj bin\th02\snd_dlym.obj bin\th02\globals.obj th02\maine_03.cpp th02\maine_04.cpp th02\staff.cpp +bin\th02\maine.exe: th02\end.cpp obj\th02\maine.obj obj\th02\grppsafx.obj obj\th02\keydelay.obj obj\th01\vplanset.obj obj\th02\pi_load.obj obj\th02\frmdely1.obj th02\maine022.cpp obj\th02\input_rs.obj obj\th02\exit.obj obj\th02\snd_mmdr.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th02\snd_load.obj obj\th02\initmain.obj obj\th02\pi_put.obj obj\th02\snd_kaja.obj obj\th02\snd_dlym.obj obj\th02\globals.obj th02\maine_03.cpp th02\maine_04.cpp th02\staff.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=2 -nbin\th02\ -eMAINE.EXE @&&| $** | -{th03}.c{bin\th03}.obj: +{th03}.c{obj\th03}.obj: $(CC) $(CFLAGS) -ml -DGAME=3 -n$(@D) -c $** -{th03}.cpp{bin\th03}.obj: +{th03}.cpp{obj\th03}.obj: $(CC) $(CFLAGS) -ml -DGAME=3 -n$(@D) -c $** bin\th03\res_yume.com: th03\res_yume.cpp @@ -123,50 +132,50 @@ bin\th03\res_yume.com: th03\res_yume.cpp $** | masters.lib -bin\th03\op.exe: th03\op_01.cpp bin\th03\op2.obj th03\op_music.cpp th03\op_02.cpp bin\th03\scoredat.obj th03\op_03.cpp bin\th03\op.obj bin\th02\exit_dos.obj bin\th01\vplanset.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th02\snd_load.obj bin\th03\exit.obj bin\th03\polar.obj bin\th03\cdg_put.obj bin\th02\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\snd_kaja.obj bin\th03\initop.obj bin\th03\cdg_load.obj bin\th03\grppsafx.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\th03\hfliplut.obj bin\th02\frmdely2.obj +bin\th03\op.exe: th03\op_01.cpp obj\th03\op2.obj th03\op_music.cpp th03\op_02.cpp obj\th03\scoredat.obj th03\op_03.cpp obj\th03\op.obj obj\th02\exit_dos.obj obj\th01\vplanset.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th02\snd_load.obj obj\th03\exit.obj obj\th03\polar.obj obj\th03\cdg_put.obj obj\th02\frmdely1.obj obj\th03\input_s.obj obj\th03\pi_put.obj obj\th03\snd_kaja.obj obj\th03\initop.obj obj\th03\cdg_load.obj obj\th03\grppsafx.obj obj\th03\pi_load.obj obj\th03\inp_m_w.obj obj\th03\cdg_p_na.obj obj\th03\hfliplut.obj obj\th02\frmdely2.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=3 -DBINARY='O' -nbin\th03\ -eOP.EXE @&&| $** | -bin\th03\main.exe: bin\th03\main.obj th03\playfld.cpp bin\th03\cfg_lres.obj th03\hitcirc.cpp th03\player_m.cpp th03\main_010.cpp th03\main_011.cpp bin\th01\vplanset.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th03\vector.obj bin\th03\exit.obj bin\th03\polar.obj bin\th02\frmdely1.obj bin\th03\input_s.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\pi_load.obj bin\th03\inp_m_w.obj bin\th03\collmap.obj bin\th03\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp +bin\th03\main.exe: obj\th03\main.obj th03\playfld.cpp obj\th03\cfg_lres.obj th03\hitcirc.cpp th03\player_m.cpp th03\main_010.cpp th03\main_011.cpp obj\th01\vplanset.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th03\vector.obj obj\th03\exit.obj obj\th03\polar.obj obj\th02\frmdely1.obj obj\th03\input_s.obj obj\th02\snd_se_r.obj obj\th03\snd_se.obj obj\th03\snd_kaja.obj obj\th03\initmain.obj obj\th03\pi_load.obj obj\th03\inp_m_w.obj obj\th03\collmap.obj obj\th03\hfliplut.obj th03\mrs.cpp th03\sprite16.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=3 -nbin\th03\ -eMAIN.EXE @&&| $** | -bin\th03\mainl.exe: bin\th03\cfg_lres.obj th03\mainl_sc.cpp bin\th03\mainl.obj th03\cutscene.cpp bin\th03\scoredat.obj th03\regist.cpp bin\th01\vplanset.obj bin\th02\snd_mode.obj bin\th02\snd_pmdr.obj bin\th02\snd_dlyv.obj bin\th02\snd_load.obj bin\th03\vector.obj bin\th03\exit.obj bin\th03\cdg_put.obj bin\th02\frmdely1.obj bin\th03\input_s.obj bin\th03\pi_put.obj bin\th03\pi_put_i.obj bin\th02\snd_se_r.obj bin\th03\snd_se.obj bin\th03\snd_kaja.obj bin\th03\initmain.obj bin\th03\cdg_load.obj th03\exitmain.cpp bin\th03\grppsafx.obj bin\th03\snd_dlym.obj bin\th03\inp_wait.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\inp_m_w.obj bin\th03\cdg_p_na.obj bin\th03\hfliplut.obj +bin\th03\mainl.exe: obj\th03\cfg_lres.obj th03\mainl_sc.cpp obj\th03\mainl.obj th03\cutscene.cpp obj\th03\scoredat.obj th03\regist.cpp obj\th01\vplanset.obj obj\th02\snd_mode.obj obj\th02\snd_pmdr.obj obj\th02\snd_dlyv.obj obj\th02\snd_load.obj obj\th03\vector.obj obj\th03\exit.obj obj\th03\cdg_put.obj obj\th02\frmdely1.obj obj\th03\input_s.obj obj\th03\pi_put.obj obj\th03\pi_put_i.obj obj\th02\snd_se_r.obj obj\th03\snd_se.obj obj\th03\snd_kaja.obj obj\th03\initmain.obj obj\th03\cdg_load.obj th03\exitmain.cpp obj\th03\grppsafx.obj obj\th03\snd_dlym.obj obj\th03\inp_wait.obj obj\th03\pi_load.obj obj\th03\pi_put_q.obj obj\th03\inp_m_w.obj obj\th03\cdg_p_na.obj obj\th03\hfliplut.obj $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=3 -DBINARY='L' -nbin\th03\ -eMAINL.EXE @&&| $** | -{th04}.c{bin\th04}.obj: +{th04}.c{obj\th04}.obj: $(CC) $(CFLAGS) -ml -DGAME=4 -n$(@D) -c $** -{th04}.cpp{bin\th04}.obj: +{th04}.cpp{obj\th04}.obj: $(CC) $(CFLAGS) -ml -DGAME=4 -n$(@D) -c $** -bin\th04\memchk.com: bin\th04\memchk.obj - $(CC) $(CFLAGS) -mt -lt $** +bin\th04\memchk.com: obj\th04\memchk.obj + $(CC) $(CFLAGS) -mt -lt -nbin\th04\ -eMEMCHK.COM $** bin\th04\res_huma.com: th04\res_huma.cpp $(CC) $(CFLAGS) -mt -lt -DGAME=4 -nbin\th04\ -eRES_HUMA.COM @&&| $** | masters.lib -bin\th04\op.exe: th04\op_main.cpp bin\th04\opm.obj bin\th01\vplanset.obj bin\th02\frmdely1.obj bin\th03\pi_put.obj bin\th03\pi_load.obj bin\th03\hfliplut.obj bin\th04\input_w.obj bin\th04\vector.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_kaja.obj bin\th04\cdg_p_nc.obj bin\th04\snd_mode.obj bin\th04\snd_dlym.obj bin\th02\exit_dos.obj bin\th04\snd_load.obj bin\th04\grppsafx.obj bin\th04\op2.obj bin\th04\cdg_put.obj bin\th04\exit.obj th04\initop.cpp bin\th04\cdg_p_na.obj bin\th04\input_s.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th04\egcrect.obj bin\th04\bgimage.obj bin\th04\bgimager.obj bin\th04\cdg_load.obj bin\th02\frmdely2.obj th04\op_setup.cpp bin\th04\zunsoft.obj th04\op_music.cpp bin\th04\op.obj th04\m_char.cpp +bin\th04\op.exe: th04\op_main.cpp obj\th04\opm.obj obj\th01\vplanset.obj obj\th02\frmdely1.obj obj\th03\pi_put.obj obj\th03\pi_load.obj obj\th03\hfliplut.obj obj\th04\input_w.obj obj\th04\vector.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_kaja.obj obj\th04\cdg_p_nc.obj obj\th04\snd_mode.obj obj\th04\snd_dlym.obj obj\th02\exit_dos.obj obj\th04\snd_load.obj obj\th04\grppsafx.obj obj\th04\op2.obj obj\th04\cdg_put.obj obj\th04\exit.obj th04\initop.cpp obj\th04\cdg_p_na.obj obj\th04\input_s.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th04\egcrect.obj obj\th04\bgimage.obj obj\th04\bgimager.obj obj\th04\cdg_load.obj obj\th02\frmdely2.obj th04\op_setup.cpp obj\th04\zunsoft.obj th04\op_music.cpp obj\th04\op.obj th04\m_char.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=4 -DBINARY='O' -nbin\th04\ -eOP.EXE @&&| $** | -bin\th04\main.exe: bin\th04\main.obj bin\th04\slowdown.obj th04\demo.cpp th04\ems.cpp th04\tile_set.cpp th04\std.cpp bin\th04\tile.obj th04\playfld.cpp th04\midboss4.cpp th04\f_dialog.cpp th04\dialog.cpp th04\boss_exp.cpp th04\stages.cpp th04\player_m.cpp bin\th04\player_p.obj bin\th04\scoreupd.obj th04\hud_ovrl.cpp bin\th04\cfg_lres.obj bin\th04\checkerb.obj bin\th04\mb_inv.obj bin\th04\boss_bd.obj bin\th01\vplanset.obj bin\th03\vector.obj bin\th02\frmdely1.obj bin\th03\hfliplut.obj th04\mpn_free.cpp bin\th04\input_w.obj th04\mpn_l_i.cpp bin\th04\vector.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_kaja.obj bin\th04\snd_mode.obj bin\th04\snd_load.obj bin\th04\cdg_put.obj bin\th04\exit.obj bin\th04\initmain.obj bin\th04\cdg_p_na.obj bin\th04\cdg_p_pr.obj bin\th04\input_s.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th04\cdg_load.obj th04\gather.cpp bin\th04\scrolly3.obj bin\th04\motion_3.obj th04\midboss.cpp bin\th04\hud_hp.obj th04\mb_dft.cpp bin\th04\vector2n.obj bin\th04\spark_a.obj bin\th04\grcg_3.obj bin\th04\it_spl_u.obj th04\boss_4m.cpp th04\bullet_u.cpp th04\bullet_a.cpp th04\boss.cpp th04\boss_4r.cpp th04\boss_x2.cpp +bin\th04\main.exe: obj\th04\main.obj obj\th04\slowdown.obj th04\demo.cpp th04\ems.cpp th04\tile_set.cpp th04\std.cpp obj\th04\tile.obj th04\playfld.cpp th04\midboss4.cpp th04\f_dialog.cpp th04\dialog.cpp th04\boss_exp.cpp th04\stages.cpp th04\player_m.cpp obj\th04\player_p.obj obj\th04\scoreupd.obj th04\hud_ovrl.cpp obj\th04\cfg_lres.obj obj\th04\checkerb.obj obj\th04\mb_inv.obj obj\th04\boss_bd.obj obj\th01\vplanset.obj obj\th03\vector.obj obj\th02\frmdely1.obj obj\th03\hfliplut.obj th04\mpn_free.cpp obj\th04\input_w.obj th04\mpn_l_i.cpp obj\th04\vector.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_kaja.obj obj\th04\snd_mode.obj obj\th04\snd_load.obj obj\th04\cdg_put.obj obj\th04\exit.obj obj\th04\initmain.obj obj\th04\cdg_p_na.obj obj\th04\cdg_p_pr.obj obj\th04\input_s.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th04\cdg_load.obj th04\gather.cpp obj\th04\scrolly3.obj obj\th04\motion_3.obj th04\midboss.cpp obj\th04\hud_hp.obj th04\mb_dft.cpp obj\th04\vector2n.obj obj\th04\spark_a.obj obj\th04\grcg_3.obj obj\th04\it_spl_u.obj th04\boss_4m.cpp th04\bullet_u.cpp th04\bullet_a.cpp th04\boss.cpp th04\boss_4r.cpp th04\boss_x2.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=4 -DBINARY='M' -nbin\th04\ -eMAIN.EXE @&&| $** | -bin\th04\maine.exe: th04\maine_e.cpp bin\th04\mainem.obj bin\th01\vplanset.obj bin\th02\frmdely1.obj bin\th03\pi_put.obj bin\th03\pi_load.obj bin\th03\pi_put_q.obj bin\th03\hfliplut.obj bin\th04\input_w.obj bin\th04\vector.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_kaja.obj bin\th04\snd_mode.obj bin\th04\snd_dlym.obj bin\th04\cdg_p_pl.obj bin\th04\snd_load.obj bin\th04\grppsafx.obj bin\th04\maine.obj bin\th04\cdg_put.obj bin\th04\exit.obj bin\th04\initmain.obj bin\th04\input_s.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\bgimager.obj bin\th04\cdg_load.obj th04\cutscene.cpp th04\staff.cpp +bin\th04\maine.exe: th04\maine_e.cpp obj\th04\mainem.obj obj\th01\vplanset.obj obj\th02\frmdely1.obj obj\th03\pi_put.obj obj\th03\pi_load.obj obj\th03\pi_put_q.obj obj\th03\hfliplut.obj obj\th04\input_w.obj obj\th04\vector.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_kaja.obj obj\th04\snd_mode.obj obj\th04\snd_dlym.obj obj\th04\cdg_p_pl.obj obj\th04\snd_load.obj obj\th04\grppsafx.obj obj\th04\maine.obj obj\th04\cdg_put.obj obj\th04\exit.obj obj\th04\initmain.obj obj\th04\input_s.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th04\bgimage.obj obj\th04\bgimager.obj obj\th04\cdg_load.obj th04\cutscene.cpp th04\staff.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=4 -DBINARY='E' -nbin\th04\ -eMAINE.EXE @&&| $** | -{th05}.cpp{bin\th05}.obj: +{th05}.cpp{obj\th05}.obj: $(CC) $(CFLAGS) -ml -DGAME=5 -n$(@D) -c $** bin\th05\res_kso.com: th05\res_kso.cpp @@ -174,17 +183,17 @@ bin\th05\res_kso.com: th05\res_kso.cpp $** | masters.lib -bin\th05\op.exe: th05\op_main.cpp bin\th05\opm.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th02\exit_dos.obj bin\th04\grppsafx.obj bin\th05\op2.obj bin\th04\cdg_p_na.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj th05\musicp_c.cpp bin\th05\musicp_a.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj th05\initop.cpp bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj th05\cdg_p_nc.cpp bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj th05\op_setup.cpp bin\th04\zunsoft.obj th05\cfg.cpp th05\op_title.cpp th05\op_music.cpp bin\th05\op.obj th05\hi_view.cpp th05\m_char.cpp +bin\th05\op.exe: th05\op_main.cpp obj\th05\opm.obj obj\th03\hfliplut.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_mode.obj obj\th02\exit_dos.obj obj\th04\grppsafx.obj obj\th05\op2.obj obj\th04\cdg_p_na.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th04\bgimage.obj obj\th05\cdg_put.obj obj\th04\exit.obj obj\th05\vector.obj th05\musicp_c.cpp obj\th05\musicp_a.obj obj\th05\bgimager.obj obj\th05\snd_load.obj obj\th05\snd_kaja.obj obj\th05\pi_cpp_1.obj obj\th05\pi_asm_1.obj obj\th05\pi_cpp_2.obj obj\th05\pi_asm_2.obj th05\initop.cpp obj\th05\input_s.obj obj\th05\inp_h_w.obj obj\th05\snd_dlym.obj th05\cdg_p_nc.cpp obj\th05\frmdelay.obj obj\th04\cdg_load.obj obj\th05\egcrect.obj th05\op_setup.cpp obj\th04\zunsoft.obj th05\cfg.cpp th05\op_title.cpp th05\op_music.cpp obj\th05\op.obj th05\hi_view.cpp th05\m_char.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='O' -nbin\th05\ -eOP.EXE @&&| $** | -bin\th05\main.exe: bin\th05\main.obj bin\th04\slowdown.obj th05\demo.cpp th05\ems.cpp bin\th05\cfg_lres.obj bin\th04\tile.obj th05\main010.cpp th05\f_dialog.cpp th05\dialog.cpp th05\boss_exp.cpp th05\playfld.cpp bin\th04\mb_inv.obj bin\th04\boss_bd.obj th05\boss_bg.cpp th05\laser_rh.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp bin\th05\player.obj bin\th05\hud_bar.obj bin\th05\scoreupd.obj th05\midboss5.cpp th05\hud_ovrl.cpp bin\th04\player_p.obj bin\th04\vector2n.obj bin\th05\spark_a.obj th05\bullet_p.cpp bin\th04\grcg_3.obj th05\player_a.cpp bin\th05\bullet_1.obj th05\bullet_c.cpp bin\th03\vector.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th05\bullet.obj th05\bullet_t.cpp bin\th04\cdg_p_na.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th05\cdg_put.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th04\scrolly3.obj bin\th04\motion_3.obj th05\gather.cpp th05\main032.cpp th05\midboss.cpp bin\th04\hud_hp.obj th05\mb_dft.cpp th05\laser.cpp th05\cheeto_u.cpp bin\th04\it_spl_u.obj th05\bullet_u.cpp th05\midboss1.cpp th05\boss_1.cpp th05\boss_4.cpp th05\boss_6.cpp th05\boss_x.cpp th05\boss.cpp th05\main014.cpp +bin\th05\main.exe: obj\th05\main.obj obj\th04\slowdown.obj th05\demo.cpp th05\ems.cpp obj\th05\cfg_lres.obj obj\th04\tile.obj th05\main010.cpp th05\f_dialog.cpp th05\dialog.cpp th05\boss_exp.cpp th05\playfld.cpp obj\th04\mb_inv.obj obj\th04\boss_bd.obj th05\boss_bg.cpp th05\laser_rh.cpp th05\p_common.cpp th05\p_reimu.cpp th05\p_marisa.cpp th05\p_mima.cpp th05\p_yuuka.cpp obj\th05\player.obj obj\th05\hud_bar.obj obj\th05\scoreupd.obj th05\midboss5.cpp th05\hud_ovrl.cpp obj\th04\player_p.obj obj\th04\vector2n.obj obj\th05\spark_a.obj th05\bullet_p.cpp obj\th04\grcg_3.obj th05\player_a.cpp obj\th05\bullet_1.obj th05\bullet_c.cpp obj\th03\vector.obj obj\th03\hfliplut.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_mode.obj obj\th05\bullet.obj th05\bullet_t.cpp obj\th04\cdg_p_na.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th05\cdg_put.obj obj\th04\exit.obj obj\th05\vector.obj obj\th05\snd_load.obj obj\th05\snd_kaja.obj obj\th05\initmain.obj obj\th05\input_s.obj obj\th05\inp_h_w.obj obj\th05\frmdelay.obj obj\th04\cdg_load.obj obj\th04\scrolly3.obj obj\th04\motion_3.obj th05\gather.cpp th05\main032.cpp th05\midboss.cpp obj\th04\hud_hp.obj th05\mb_dft.cpp th05\laser.cpp th05\cheeto_u.cpp obj\th04\it_spl_u.obj th05\bullet_u.cpp th05\midboss1.cpp th05\boss_1.cpp th05\boss_4.cpp th05\boss_6.cpp th05\boss_x.cpp th05\boss.cpp th05\main014.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='M' -nbin\th05\ -eMAIN.EXE @&&| $** | -bin\th05\maine.exe: th05\maine_e.cpp bin\th05\mainem.obj bin\th03\hfliplut.obj bin\th04\snd_pmdr.obj bin\th04\snd_mmdr.obj bin\th04\snd_mode.obj bin\th04\grppsafx.obj bin\th05\maine.obj bin\th04\cdg_p_na.obj bin\th02\snd_se_r.obj bin\th04\snd_se.obj bin\th04\bgimage.obj bin\th04\exit.obj bin\th05\vector.obj bin\th05\bgimager.obj bin\th05\snd_load.obj bin\th05\snd_kaja.obj bin\th05\pi_cpp_1.obj bin\th05\pi_asm_1.obj bin\th05\pi_cpp_2.obj bin\th05\pi_asm_2.obj bin\th05\initmain.obj bin\th05\input_s.obj bin\th05\inp_h_w.obj bin\th05\snd_dlym.obj bin\th05\frmdelay.obj bin\th04\cdg_load.obj bin\th05\egcrect.obj th05\cutscene.cpp th05\regist.cpp th05\staff.cpp +bin\th05\maine.exe: th05\maine_e.cpp obj\th05\mainem.obj obj\th03\hfliplut.obj obj\th04\snd_pmdr.obj obj\th04\snd_mmdr.obj obj\th04\snd_mode.obj obj\th04\grppsafx.obj obj\th05\maine.obj obj\th04\cdg_p_na.obj obj\th02\snd_se_r.obj obj\th04\snd_se.obj obj\th04\bgimage.obj obj\th04\exit.obj obj\th05\vector.obj obj\th05\bgimager.obj obj\th05\snd_load.obj obj\th05\snd_kaja.obj obj\th05\pi_cpp_1.obj obj\th05\pi_asm_1.obj obj\th05\pi_cpp_2.obj obj\th05\pi_asm_2.obj obj\th05\initmain.obj obj\th05\input_s.obj obj\th05\inp_h_w.obj obj\th05\snd_dlym.obj obj\th05\frmdelay.obj obj\th04\cdg_load.obj obj\th05\egcrect.obj th05\cutscene.cpp th05\regist.cpp th05\staff.cpp $(CC) $(CFLAGS) $(LARGE_LFLAGS) -DGAME=5 -DBINARY='E' -nbin\th05\ -eMAINE.EXE @&&| $** | @@ -196,7 +205,7 @@ Research: # ZUN.COM packing -{bin\Pipeline}.obj{bin\Pipeline}.bin: +{obj\Pipeline}.obj{obj\Pipeline}.bin: tlink -t $**, $@ bin\Pipeline\zungen.com: Pipeline\zungen.c @@ -205,30 +214,30 @@ bin\Pipeline\zungen.com: Pipeline\zungen.c bin\Pipeline\comcstm.com: Pipeline\comcstm.c $(CC) $(CFLAGS_OPTIMIZED) -mt -lt -IPipeline\ -nbin\Pipeline\ -eCOMCSTM.com $** -ZUNCOM_PREREQ = bin\Pipeline\zungen.com bin\Pipeline\zun_stub.bin +ZUNCOM_PREREQ = bin\Pipeline\zungen.com obj\Pipeline\zun_stub.bin bin\th02\zun.com : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th02\zuninit.com bin\th02\zun_res.com bin\th01\zunsoft.com - bin\Pipeline\zungen bin\Pipeline\zun_stub.bin &&| + bin\Pipeline\zungen obj\Pipeline\zun_stub.bin &&| 4 ONGCHK ZUNINIT ZUN_RES ZUNSOFT libs\kaja\ongchk.com bin\th02\zuninit.com bin\th02\zun_res.com bin\th01\zunsoft.com | bin\th02\zun.com bin\th03\zun.com : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th02\zuninit.com bin\th01\zunsoft.com bin\th03\zunsp.com bin\th03\res_yume.com - bin\Pipeline\zungen bin\Pipeline\zun_stub.bin &&| + bin\Pipeline\zungen obj\Pipeline\zun_stub.bin &&| 5 -1 -2 -3 -4 -5 libs\kaja\ongchk.com bin\th02\zuninit.com bin\th01\zunsoft.com bin\th03\zunsp.com bin\th03\res_yume.com | bin\th03\zun.com -bin\th04\zuncom.bin : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th04\zuninit.com bin\th04\res_huma.com bin\th04\memchk.com - bin\Pipeline\zungen bin\Pipeline\zun_stub.bin &&| +obj\th04\zuncom.bin : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th04\zuninit.com bin\th04\res_huma.com bin\th04\memchk.com + bin\Pipeline\zungen obj\Pipeline\zun_stub.bin &&| 4 -O -I -S -M libs\kaja\ongchk.com bin\th04\zuninit.com bin\th04\res_huma.com bin\th04\memchk.com -| bin\th04\zuncom.bin +| obj\th04\zuncom.bin -bin\th05\zuncom.bin : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th05\zuninit.com bin\th05\res_kso.com bin\th05\gjinit.com bin\th05\memchk.com - bin\Pipeline\zungen bin\Pipeline\zun_stub.bin &&| +obj\th05\zuncom.bin : $(ZUNCOM_PREREQ) libs\kaja\ongchk.com bin\th05\zuninit.com bin\th05\res_kso.com bin\th05\gjinit.com bin\th05\memchk.com + bin\Pipeline\zungen obj\Pipeline\zun_stub.bin &&| 5 -O -I -S -G -M libs\kaja\ongchk.com bin\th05\zuninit.com bin\th05\res_kso.com bin\th05\gjinit.com bin\th05\memchk.com -| bin\th05\zuncom.bin +| obj\th05\zuncom.bin -bin\th04\zun.com : bin\Pipeline\comcstm.com th04\zun.txt bin\th04\zuncom.bin bin\Pipeline\cstmstub.bin - bin\Pipeline\comcstm th04\zun.txt bin\th04\zuncom.bin bin\Pipeline\cstmstub.bin 621381155 bin\th04\zun.com +bin\th04\zun.com : bin\Pipeline\comcstm.com th04\zun.txt obj\th04\zuncom.bin bin\Pipeline\cstmstub.bin + bin\Pipeline\comcstm th04\zun.txt obj\th04\zuncom.bin bin\Pipeline\cstmstub.bin 621381155 bin\th04\zun.com -bin\th05\zun.com : bin\Pipeline\comcstm.com th05\zun.txt bin\th05\zuncom.bin bin\Pipeline\cstmstub.bin - bin\Pipeline\comcstm th05\zun.txt bin\th05\zuncom.bin bin\Pipeline\cstmstub.bin 628731748 bin\th05\zun.com +bin\th05\zun.com : bin\Pipeline\comcstm.com th05\zun.txt obj\th05\zuncom.bin bin\Pipeline\cstmstub.bin + bin\Pipeline\comcstm th05\zun.txt obj\th05\zuncom.bin bin\Pipeline\cstmstub.bin 628731748 bin\th05\zun.com diff --git a/Tupfile b/Tupfile index d9fe8362..548af78b 100644 --- a/Tupfile +++ b/Tupfile @@ -84,47 +84,47 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe : Research/blitperf.bmp |> !bmp2arr -sym sBLITPERF -of cpp -sw 16 -sh 16 |> Research/blitperf.csp -!as = |> $(AS) %f %o |> bin\\%B.obj -!as2 = |> $(AS) /dGAME=2 th02\%b %o |> bin\\th02\\%B.obj -!as3 = |> $(AS) /dGAME=3 th03\%b %o |> bin\\th03\\%B.obj -!as4 = |> $(AS) /dGAME=4 th04\%b %o |> bin\\th04\\%B.obj -!as5 = |> $(AS) /dGAME=5 th05\%b %o |> bin\\th05\\%B.obj +!as = |> $(AS) %f %o |> obj\\%B.obj +!as2 = |> $(AS) /dGAME=2 th02\%b %o |> obj\\th02\\%B.obj +!as3 = |> $(AS) /dGAME=3 th03\%b %o |> obj\\th03\\%B.obj +!as4 = |> $(AS) /dGAME=4 th04\%b %o |> obj\\th04\\%B.obj +!as5 = |> $(AS) /dGAME=5 th05\%b %o |> obj\\th05\\%B.obj # Third-party libraries -: libs\\piloadc\\piloadc.asm |> $(AS) /ml libs\piloadc\%b %o |> bin\\%B.obj +: libs\\piloadc\\piloadc.asm |> $(AS) /ml libs\piloadc\%b %o |> obj\\%B.obj # ZUN.COM -: Pipeline\\zun_stub.asm |> $(AS) Pipeline\%b %o |> bin\\Pipeline\\%B.obj -: Pipeline\\cstmstub.asm |> $(AS) Pipeline\%b %o |> bin\\Pipeline\\%B.obj +: Pipeline\\zun_stub.asm |> $(AS) Pipeline\%b %o |> obj\\Pipeline\\%B.obj +: Pipeline\\cstmstub.asm |> $(AS) Pipeline\%b %o |> obj\\Pipeline\\%B.obj -: th01_op.asm |> $(AS) /dGAME=1 %f %o |> bin\\th01\\op.obj -: th01_reiiden.asm |> $(AS) /dGAME=1 %f %o |> bin\\th01\\reiiden.obj -: th01_fuuin.asm |> $(AS) /dGAME=1 %f %o |> bin\\th01\\fuuin.obj +: th01_op.asm |> $(AS) /dGAME=1 %f %o |> obj\\th01\\op.obj +: th01_reiiden.asm |> $(AS) /dGAME=1 %f %o |> obj\\th01\\reiiden.obj +: th01_fuuin.asm |> $(AS) /dGAME=1 %f %o |> obj\\th01\\fuuin.obj -: th02_zuninit.asm |> $(AS) /dGAME=2 %f %o |> bin\\th02\\zuninit.obj -: th02_op.asm |> $(AS) /dGAME=2 %f %o |> bin\\th02\\op.obj +: th02_zuninit.asm |> $(AS) /dGAME=2 %f %o |> obj\\th02\\zuninit.obj +: th02_op.asm |> $(AS) /dGAME=2 %f %o |> obj\\th02\\op.obj : th02_main.asm | \ th02/sprites/bombpart.asp \ th02/sprites/pellet.asp \ th02/sprites/sparks.asp \ th02/sprites/pointnum.asp \ - |> $(AS) /dGAME=2 %f %o |> bin\\th02\\main.obj -: th02_maine.asm |> $(AS) /dGAME=2 %f %o |> bin\\th02\\maine.obj + |> $(AS) /dGAME=2 %f %o |> obj\\th02\\main.obj +: th02_maine.asm |> $(AS) /dGAME=2 %f %o |> obj\\th02\\maine.obj -: libs/sprite16/sprite16.asm |> $(AS) /dTHIEF libs\sprite16\sprite16.asm %o |> bin\\th03\\zunsp.obj +: libs/sprite16/sprite16.asm |> $(AS) /dTHIEF libs\sprite16\sprite16.asm %o |> obj\\th03\\zunsp.obj : th03\\cdg_put.asm |> !as3 |> : th03\\cdg_p_na.asm |> !as3 |> : th03\\hfliplut.asm |> !as3 |> : th03\\collmap.asm |> !as3 |> -: th03_op.asm |> $(AS) /dGAME=3 %f %o |> bin\\th03\\op.obj -: th03_op2.asm |> $(AS) /dGAME=3 %f %o |> bin\\th03\\op2.obj +: th03_op.asm |> $(AS) /dGAME=3 %f %o |> obj\\th03\\op.obj +: th03_op2.asm |> $(AS) /dGAME=3 %f %o |> obj\\th03\\op2.obj : th03_main.asm | \ th03/sprites/score.asp \ - |> $(AS) /dGAME=3 %f %o |> bin\\th03\\main.obj -: th03_mainl.asm |> $(AS) /dGAME=3 %f %o |> bin\\th03\\mainl.obj + |> $(AS) /dGAME=3 %f %o |> obj\\th03\\main.obj +: th03_mainl.asm |> $(AS) /dGAME=3 %f %o |> obj\\th03\\mainl.obj -: th04_zuninit.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\zuninit.obj -: th04_memchk.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\memchk.obj +: th04_zuninit.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\zuninit.obj +: th04_memchk.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\memchk.obj : th04\\scoreupd.asm |> !as4 |> : th04\\cdg_put.asm |> !as4 |> : th04\\cdg_p_nc.asm |> !as4 |> @@ -137,23 +137,23 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe : th04\\spark_a.asm |> !as4 |> : th04\\vector2n.asm |> !as4 |> : th04\\grppsafx.asm |> !as4 |> -: th04_op.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\op.obj -: th04_op2.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\op2.obj -: th04_op_master.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\opm.obj +: th04_op.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\op.obj +: th04_op2.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\op2.obj +: th04_op_master.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\opm.obj : th04_main.asm | \ th02/sprites/pellet.asp \ th04/sprites/pelletbt.asp \ th02/sprites/sparks.asp \ th04/sprites/pointnum.asp \ - |> $(AS) /dGAME=4 %f %o |> bin\\th04\\main.obj -: th04_maine_master.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\mainem.obj -: th04_maine.asm |> $(AS) /dGAME=4 %f %o |> bin\\th04\\maine.obj + |> $(AS) /dGAME=4 %f %o |> obj\\th04\\main.obj +: th04_maine_master.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\mainem.obj +: th04_maine.asm |> $(AS) /dGAME=4 %f %o |> obj\\th04\\maine.obj -: th05_zuninit.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\zuninit.obj +: th05_zuninit.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\zuninit.obj : th05_gjinit.asm | \ th05/sprites/gaiji.asp \ - |> $(AS) /dGAME=5 %f %o |> bin\\th05\\gjinit.obj -: th05_memchk.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\memchk.obj + |> $(AS) /dGAME=5 %f %o |> obj\\th05\\gjinit.obj +: th05_memchk.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\memchk.obj : th05\\scoreupd.asm |> !as5 |> : th05\\player.asm |> !as5 |> : th05\\hud_bar.asm |> !as5 |> @@ -166,16 +166,16 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe : th05\\pi_asm_1.asm |> !as5 |> : th05\\pi_asm_2.asm |> !as5 |> : th05\\spark_a.asm |> !as5 |> -: th05_op.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\op.obj +: th05_op.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\op.obj : th05_op2.asm | \ th05/sprites/piano_l.asp \ - |> $(AS) /dGAME=5 %f %o |> bin\\th05\\op2.obj -: th05_op_master.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\opm.obj + |> $(AS) /dGAME=5 %f %o |> obj\\th05\\op2.obj +: th05_op_master.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\opm.obj : th05_main.asm | \ th02/sprites/pellet.asp \ th04/sprites/pelletbt.asp \ th02/sprites/sparks.asp \ th04/sprites/pointnum.asp \ - |> $(AS) /dGAME=5 %f %o |> bin\\th05\\main.obj -: th05_maine_master.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\mainem.obj -: th05_maine.asm |> $(AS) /dGAME=5 %f %o |> bin\\th05\\maine.obj + |> $(AS) /dGAME=5 %f %o |> obj\\th05\\main.obj +: th05_maine_master.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\mainem.obj +: th05_maine.asm |> $(AS) /dGAME=5 %f %o |> obj\\th05\\maine.obj diff --git a/Tupfile.bat b/Tupfile.bat index c6137247..f019b32f 100644 --- a/Tupfile.bat +++ b/Tupfile.bat @@ -25,64 +25,64 @@ bin\\Pipeline\\bmp2arr.exe -q -i th04/sprites/pointnum.bmp -o th04/sprites/point bin\\Pipeline\\bmp2arr.exe -q -i th05/sprites/gaiji.bmp -o th05/sprites/gaiji.asp -sym _sGAIJI -of asm -sw 16 -sh 16 bin\\Pipeline\\bmp2arr.exe -q -i th05/sprites/piano_l.bmp -o th05/sprites/piano_l.asp -sym _sPIANO_LABEL_FONT -of asm -sw 8 -sh 8 bin\\Pipeline\\bmp2arr.exe -q -i Research/blitperf.bmp -o Research/blitperf.csp -sym sBLITPERF -of cpp -sw 16 -sh 16 -tasm32 /m /mx /kh32768 /t /ml libs\piloadc\piloadc.asm bin\piloadc.obj -tasm32 /m /mx /kh32768 /t Pipeline\zun_stub.asm bin\Pipeline\zun_stub.obj -tasm32 /m /mx /kh32768 /t Pipeline\cstmstub.asm bin\Pipeline\cstmstub.obj -tasm32 /m /mx /kh32768 /t /dGAME=1 th01_op.asm bin\th01\op.obj -tasm32 /m /mx /kh32768 /t /dGAME=1 th01_reiiden.asm bin\th01\reiiden.obj -tasm32 /m /mx /kh32768 /t /dGAME=1 th01_fuuin.asm bin\th01\fuuin.obj -tasm32 /m /mx /kh32768 /t /dGAME=2 th02_zuninit.asm bin\th02\zuninit.obj -tasm32 /m /mx /kh32768 /t /dGAME=2 th02_op.asm bin\th02\op.obj -tasm32 /m /mx /kh32768 /t /dGAME=2 th02_main.asm bin\th02\main.obj -tasm32 /m /mx /kh32768 /t /dGAME=2 th02_maine.asm bin\th02\maine.obj -tasm32 /m /mx /kh32768 /t /DTHIEF libs\sprite16\sprite16.asm bin\th03\zunsp.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03\cdg_put.asm bin\th03\cdg_put.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03\cdg_p_na.asm bin\th03\cdg_p_na.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03\\collmap.asm bin\th03\collmap.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03\\hfliplut.asm bin\th03\hfliplut.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03_op.asm bin\th03\op.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03_op2.asm bin\th03\op2.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03_main.asm bin\th03\main.obj -tasm32 /m /mx /kh32768 /t /dGAME=3 th03_mainl.asm bin\th03\mainl.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_zuninit.asm bin\th04\zuninit.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_memchk.asm bin\th04\memchk.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\scoreupd.asm bin\th04\scoreupd.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_put.asm bin\th04\cdg_put.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_nc.asm bin\th04\cdg_p_nc.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_pl.asm bin\th04\cdg_p_pl.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_pr.asm bin\th04\cdg_p_pr.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\input_s.asm bin\th04\input_s.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_load.asm bin\th04\cdg_load.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\bgimager.asm bin\th04\bgimager.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\motion_3.asm bin\th04\motion_3.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\spark_a.asm bin\th04\spark_a.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\vector2n.asm bin\th04\vector2n.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04\grppsafx.asm bin\th04\grppsafx.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op.asm bin\th04\op.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op2.asm bin\th04\op2.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op_master.asm bin\th04\opm.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_main.asm bin\th04\main.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_maine.asm bin\th04\maine.obj -tasm32 /m /mx /kh32768 /t /dGAME=4 th04_maine_master.asm bin\th04\mainem.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_zuninit.asm bin\th05\zuninit.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_gjinit.asm bin\th05\gjinit.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_memchk.asm bin\th05\memchk.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\scoreupd.asm bin\th05\scoreupd.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\player.asm bin\th05\player.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\hud_bar.asm bin\th05\hud_bar.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bullet_1.asm bin\th05\bullet_1.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bullet.asm bin\th05\bullet.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\input_s.asm bin\th05\input_s.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\cdg_put.asm bin\th05\cdg_put.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\musicp_a.asm bin\th05\musicp_a.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bgimager.asm bin\th05\bgimager.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\pi_asm_1.asm bin\th05\pi_asm_1.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\pi_asm_2.asm bin\th05\pi_asm_2.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05\spark_a.asm bin\th05\spark_a.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op.asm bin\th05\op.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op2.asm bin\th05\op2.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op_master.asm bin\th05\opm.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_main.asm bin\th05\main.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_maine.asm bin\th05\maine.obj -tasm32 /m /mx /kh32768 /t /dGAME=5 th05_maine_master.asm bin\th05\mainem.obj +tasm32 /m /mx /kh32768 /t /ml libs\piloadc\piloadc.asm obj\piloadc.obj +tasm32 /m /mx /kh32768 /t Pipeline\zun_stub.asm obj\Pipeline\zun_stub.obj +tasm32 /m /mx /kh32768 /t Pipeline\cstmstub.asm obj\Pipeline\cstmstub.obj +tasm32 /m /mx /kh32768 /t /dGAME=1 th01_op.asm obj\th01\op.obj +tasm32 /m /mx /kh32768 /t /dGAME=1 th01_reiiden.asm obj\th01\reiiden.obj +tasm32 /m /mx /kh32768 /t /dGAME=1 th01_fuuin.asm obj\th01\fuuin.obj +tasm32 /m /mx /kh32768 /t /dGAME=2 th02_zuninit.asm obj\th02\zuninit.obj +tasm32 /m /mx /kh32768 /t /dGAME=2 th02_op.asm obj\th02\op.obj +tasm32 /m /mx /kh32768 /t /dGAME=2 th02_main.asm obj\th02\main.obj +tasm32 /m /mx /kh32768 /t /dGAME=2 th02_maine.asm obj\th02\maine.obj +tasm32 /m /mx /kh32768 /t /DTHIEF libs\sprite16\sprite16.asm obj\th03\zunsp.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03\cdg_put.asm obj\th03\cdg_put.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03\cdg_p_na.asm obj\th03\cdg_p_na.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03\\collmap.asm obj\th03\collmap.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03\\hfliplut.asm obj\th03\hfliplut.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03_op.asm obj\th03\op.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03_op2.asm obj\th03\op2.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03_main.asm obj\th03\main.obj +tasm32 /m /mx /kh32768 /t /dGAME=3 th03_mainl.asm obj\th03\mainl.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_zuninit.asm obj\th04\zuninit.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_memchk.asm obj\th04\memchk.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\scoreupd.asm obj\th04\scoreupd.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_put.asm obj\th04\cdg_put.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_nc.asm obj\th04\cdg_p_nc.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_pl.asm obj\th04\cdg_p_pl.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_p_pr.asm obj\th04\cdg_p_pr.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\input_s.asm obj\th04\input_s.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\cdg_load.asm obj\th04\cdg_load.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\bgimager.asm obj\th04\bgimager.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\motion_3.asm obj\th04\motion_3.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\spark_a.asm obj\th04\spark_a.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\vector2n.asm obj\th04\vector2n.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04\grppsafx.asm obj\th04\grppsafx.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op.asm obj\th04\op.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op2.asm obj\th04\op2.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_op_master.asm obj\th04\opm.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_main.asm obj\th04\main.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_maine.asm obj\th04\maine.obj +tasm32 /m /mx /kh32768 /t /dGAME=4 th04_maine_master.asm obj\th04\mainem.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_zuninit.asm obj\th05\zuninit.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_gjinit.asm obj\th05\gjinit.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_memchk.asm obj\th05\memchk.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\scoreupd.asm obj\th05\scoreupd.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\player.asm obj\th05\player.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\hud_bar.asm obj\th05\hud_bar.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bullet_1.asm obj\th05\bullet_1.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bullet.asm obj\th05\bullet.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\input_s.asm obj\th05\input_s.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\cdg_put.asm obj\th05\cdg_put.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\musicp_a.asm obj\th05\musicp_a.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\bgimager.asm obj\th05\bgimager.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\pi_asm_1.asm obj\th05\pi_asm_1.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\pi_asm_2.asm obj\th05\pi_asm_2.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05\spark_a.asm obj\th05\spark_a.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op.asm obj\th05\op.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op2.asm obj\th05\op2.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_op_master.asm obj\th05\opm.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_main.asm obj\th05\main.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_maine.asm obj\th05\maine.obj +tasm32 /m /mx /kh32768 /t /dGAME=5 th05_maine_master.asm obj\th05\mainem.obj @echo off diff --git a/build32b.bat b/build32b.bat index 953cbb55..20b2577d 100755 --- a/build32b.bat +++ b/build32b.bat @@ -28,7 +28,10 @@ if errorlevel 1 goto no_bcc32 : Neither BCC32 nor TASM32 automatically create nonexisting output : directories. Tup would, but not everybody can use it. +mkdir obj %STDERR_IGNORE% +mkdir obj\Pipeline %STDERR_IGNORE% mkdir bin\Pipeline %STDERR_IGNORE% +for %%i in (1 2 3 4 5) do mkdir obj\th0%%i %STDERR_IGNORE% for %%i in (1 2 3 4 5) do mkdir bin\th0%%i %STDERR_IGNORE% call set_errorlevel_to_1.bat