mirror of https://github.com/nmlgc/ReC98.git
[Build] Move ZUN.COM generation code into the `Pipeline/` directory
These are just as much of a part of the PC-98 Touhou build pipeline as the sprite compiler. The future Tupfile will use the tupblocks concept of treating the build configuration as a branching tree, so we'd like everything under `Pipeline/` to share a single set of configuration flags. Part of P0002, funded by GhostPhanom.
This commit is contained in:
nmlgc
parent
b9d5c743a2
commit
c95d7c5aa8
|
|
@ -2,4 +2,4 @@
|
|||
*.bat text eol=crlf
|
||||
*.[ch]* text eol=lf
|
||||
*.mak text eol=lf
|
||||
zuncom/zun*.txt -text
|
||||
zun.txt -text
|
||||
|
|
|
|||
28
Makefile.mak
28
Makefile.mak
|
|
@ -192,39 +192,39 @@ Research:
|
|||
|
||||
# ZUN.COM packing
|
||||
|
||||
{bin\zuncom}.obj{bin\zuncom}.bin:
|
||||
{bin\Pipeline}.obj{bin\Pipeline}.bin:
|
||||
tlink -t $**, $@
|
||||
|
||||
bin\zuncom\zungen.com: zuncom\zungen.c
|
||||
$(CC) $(CFLAGS) -mt -lt -nbin\zuncom\ -eZUNGEN.COM $**
|
||||
bin\Pipeline\zungen.com: Pipeline\zungen.c
|
||||
$(CC) $(CFLAGS) -mt -lt -IPipeline\ -nbin\Pipeline\ -eZUNGEN.COM $**
|
||||
|
||||
bin\zuncom\comcstm.com: zuncom\comcstm.c
|
||||
$(CC) $(CFLAGS) -mt -lt -nbin\zuncom\ -eCOMCSTM.com $**
|
||||
bin\Pipeline\comcstm.com: Pipeline\comcstm.c
|
||||
$(CC) $(CFLAGS) -mt -lt -IPipeline\ -nbin\Pipeline\ -eCOMCSTM.com $**
|
||||
|
||||
ZUNCOM_PREREQ = bin\zuncom\zungen.com bin\zuncom\zun_stub.bin
|
||||
ZUNCOM_PREREQ = bin\Pipeline\zungen.com bin\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\zuncom\zungen bin\zuncom\zun_stub.bin &&|
|
||||
bin\Pipeline\zungen bin\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\zuncom\zungen bin\zuncom\zun_stub.bin &&|
|
||||
bin\Pipeline\zungen bin\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\zuncom\zungen bin\zuncom\zun_stub.bin &&|
|
||||
bin\Pipeline\zungen bin\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
|
||||
|
||||
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\zuncom\zungen bin\zuncom\zun_stub.bin &&|
|
||||
bin\Pipeline\zungen bin\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
|
||||
|
||||
bin\th04\zun.com : bin\zuncom\comcstm.com zuncom\zun4.txt bin\th04\zuncom.bin bin\zuncom\cstmstub.bin
|
||||
bin\zuncom\comcstm zuncom\zun4.txt bin\th04\zuncom.bin bin\zuncom\cstmstub.bin 621381155 bin\th04\zun.com
|
||||
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\th05\zun.com : bin\zuncom\comcstm.com zuncom\zun5.txt bin\th05\zuncom.bin bin\zuncom\cstmstub.bin
|
||||
bin\zuncom\comcstm zuncom\zun5.txt bin\th05\zuncom.bin bin\zuncom\cstmstub.bin 628731748 bin\th05\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
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
#include <string.h>
|
||||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include "zuncom/common.h"
|
||||
#include "./common.h"
|
||||
static const char copyright[] = "comcstm (c)O.Morikawa 1996";
|
||||
#define HEADER_SIZE (3+2+2+2+4+sizeof(copyright)-1)
|
||||
int main(int argc, char **argv) {
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
#include <errno.h>
|
||||
#include <stdlib.h>
|
||||
#include <dir.h>
|
||||
#include "zuncom/common.h"
|
||||
#include "./common.h"
|
||||
int readparam(char *path, size_t size, FILE* fl) {
|
||||
char c = '\0';
|
||||
char *pathp = path;
|
||||
4
Tupfile
4
Tupfile
|
|
@ -94,8 +94,8 @@ BMP2ARR = bin\\Pipeline\\bmp2arr.exe
|
|||
: libs\\piloadc\\piloadc.asm |> $(AS) /ml libs\piloadc\%b %o |> bin\\%B.obj
|
||||
|
||||
# ZUN.COM
|
||||
: zuncom\\zun_stub.asm |> $(AS) zuncom\%b %o |> bin\\zuncom\\%B.obj
|
||||
: zuncom\\cstmstub.asm |> $(AS) zuncom\%b %o |> bin\\zuncom\\%B.obj
|
||||
: Pipeline\\zun_stub.asm |> $(AS) Pipeline\%b %o |> bin\\Pipeline\\%B.obj
|
||||
: Pipeline\\cstmstub.asm |> $(AS) Pipeline\%b %o |> bin\\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
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ bin\\Pipeline\\bmp2arr.exe -q -i th05/sprites/gaiji.bmp -o th05/sprites/gaiji.as
|
|||
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 zuncom\zun_stub.asm bin\zuncom\zun_stub.obj
|
||||
tasm32 /m /mx /kh32768 /t zuncom\cstmstub.asm bin\zuncom\cstmstub.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
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ if errorlevel 1 goto no_bcc32
|
|||
|
||||
: Neither BCC32 nor TASM32 automatically create nonexisting output
|
||||
: directories. Tup would, but not everybody can use it.
|
||||
mkdir bin\zuncom %STDERR_IGNORE%
|
||||
mkdir bin\Pipeline %STDERR_IGNORE%
|
||||
for %%i in (1 2 3 4 5) do mkdir bin\th0%%i %STDERR_IGNORE%
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue