Skip to content

Commit aefcde6

Browse files
committed
incbin/getslice replacement
1 parent ab1e9ee commit aefcde6

File tree

13 files changed

+84
-31
lines changed

13 files changed

+84
-31
lines changed

ALKU/ALKU.MAK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ copper.obj: alku.cfg copper.asm
6262
$(TASM) /M9 /MX /ZI /O COPPER.ASM,COPPER.OBJ
6363

6464
fona.inc: fona.uh
65-
-incbin fona.uh fona.tmp
65+
..\util\incbin fona.uh fona.tmp
6666
..\util2\tail < fona.tmp > $@
6767

6868
hoi.in0 hoi.in1: hoi.u

ALKU/INCBIN.EXE

-14.8 KB
Binary file not shown.

CREDITS/CRED.MAK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ includ2.obj: cred.cfg includ2.asm
6060
fona.inc: fona.uh
6161
# This strips away the palette part
6262
..\util2\strip1b fona.uh fona.utm
63-
-incbin fona.utm fona.tmp
63+
..\util\incbin fona.utm fona.tmp
6464
..\util2\tail < fona.tmp > $@
6565

6666
fona.uh: fona.lbm

CREDITS/INCBIN.EXE

-14.8 KB
Binary file not shown.

CREDITS/UNPACK.BAT

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
1-
INCBIN.EXE PICS\PIC01.UH pic01.inc
2-
iNCBIN.EXE PICS\PIC02.UH pic02.inc
3-
INCBIN.EXE PICS\PIC03.UH pic03.inc
4-
INCBIN.EXE PICS\PIC04.UH pic04.inc
5-
INCBIN.EXE PICS\PIC05.UH pic05.inc
6-
INCBIN.EXE PICS\PIC05b.UH pic05b.inc
7-
INCBIN.EXE PICS\PIC06.UH pic06.inc
8-
INCBIN.EXE PICS\PIC07.UH pic07.inc
9-
INCBIN.EXE PICS\PIC08.UH pic08.inc
10-
INCBIN.EXE PICS\PIC09.UH pic09.inc
11-
INCBIN.EXE PICS\PIC10.UH pic10.inc
12-
INCBIN.EXE PICS\PIC10b.UH pic10b.inc
13-
INCBIN.EXE PICS\PIC11.UH pic11.inc
14-
INCBIN.EXE PICS\PIC12.UH pic12.inc
15-
INCBIN.EXE PICS\PIC13.UH pic13.inc
16-
INCBIN.EXE PICS\PIC14.UH pic14.inc
17-
INCBIN.EXE PICS\PIC14b.UH pic14b.inc
18-
INCBIN.EXE PICS\PIC15.UH pic15.inc
19-
INCBIN.EXE PICS\PIC16.UH pic16.inc
20-
INCBIN.EXE PICS\PIC17.UH pic17.inc
21-
INCBIN.EXE PICS\PIC18.UH pic18.inc
1+
..\util\incbin PICS\PIC01.UH pic01.inc
2+
..\util\incbin PICS\PIC02.UH pic02.inc
3+
..\util\incbin PICS\PIC03.UH pic03.inc
4+
..\util\incbin PICS\PIC04.UH pic04.inc
5+
..\util\incbin PICS\PIC05.UH pic05.inc
6+
..\util\incbin PICS\PIC05b.UH pic05b.inc
7+
..\util\incbin PICS\PIC06.UH pic06.inc
8+
..\util\incbin PICS\PIC07.UH pic07.inc
9+
..\util\incbin PICS\PIC08.UH pic08.inc
10+
..\util\incbin PICS\PIC09.UH pic09.inc
11+
..\util\incbin PICS\PIC10.UH pic10.inc
12+
..\util\incbin PICS\PIC10b.UH pic10b.inc
13+
..\util\incbin PICS\PIC11.UH pic11.inc
14+
..\util\incbin PICS\PIC12.UH pic12.inc
15+
..\util\incbin PICS\PIC13.UH pic13.inc
16+
..\util\incbin PICS\PIC14.UH pic14.inc
17+
..\util\incbin PICS\PIC14b.UH pic14b.inc
18+
..\util\incbin PICS\PIC15.UH pic15.inc
19+
..\util\incbin PICS\PIC16.UH pic16.inc
20+
..\util\incbin PICS\PIC17.UH pic17.inc
21+
..\util\incbin PICS\PIC18.UH pic18.inc

ENDSCRL/ENDSCRL.MAK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ asmyt.obj: endscrl.cfg asmyt.asm fona.inc
5050
fona.inc: fona.uh
5151
# This strips away the palette part
5252
..\util2\strip1b fona.uh fona.utm
53-
-..\credits\incbin fona.utm fona.tmp
53+
..\util\incbin fona.utm fona.tmp
5454
..\util2\tail < fona.tmp > $@
5555

5656
fona.uh: fona.lbm

MAIN/PROT/INCBIN.EXE

-14.8 KB
Binary file not shown.

PAM/PAM.MAK

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ out.in0: out.ani
6868
..\util2\cut64kb out.ani out.in
6969

7070
pal.inc: out.u
71-
-..\credits\incbin pal.pal $@
71+
..\util\incbin pal.pal $@
7272

7373
# *Compiler Configuration File*
7474
pam.cfg: pam.mak

UTIL/GETSLICE.C

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#include <stdio.h>
2+
#include <stdlib.h>
3+
4+
int main(int argc, char *argv[])
5+
{
6+
unsigned count, num;
7+
int ch;
8+
FILE *inf, *outf;
9+
if (argc < 5)
10+
return 1;
11+
inf = fopen(argv[1], "rb");
12+
outf = fopen(argv[4], "wb");
13+
num = strtol(argv[2], NULL, 10);
14+
for (count=0; count<num; count++)
15+
getc(inf);
16+
num = strtol(argv[3], NULL, 10);
17+
for (count=0; count<num; count++) {
18+
ch = getc(inf);
19+
putc(ch, outf);
20+
}
21+
fclose(inf);
22+
fclose(outf);
23+
return 0;
24+
}

UTIL/GETSLICE.EXE

-10.1 KB
Binary file not shown.

UTIL/INCBIN.C

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#include <stdio.h>
2+
#include <stdlib.h>
3+
4+
int main(int argc, char *argv[])
5+
{
6+
int ch;
7+
unsigned count=0;
8+
FILE *inf, *outf;
9+
if (argc < 3)
10+
return 1;
11+
inf = fopen(argv[1], "rb");
12+
outf = fopen(argv[2], "wb");
13+
while ((ch = getc(inf)) != EOF) {
14+
fprintf(outf, "%s%d", count&0xf?",":"\n\tdb\t", ch);
15+
if (!count)
16+
count++;
17+
count++;
18+
}
19+
fprintf(outf, "\n");
20+
fclose(inf);
21+
fclose(outf);
22+
return 0;
23+
}

UTIL/MAKEFILE

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
all : doobj.exe lbm2p.exe lbm2u.exe
1+
all : doobj.exe getslice.exe incbin.exe lbm2p.exe lbm2u.exe
22

33
# objects
44

@@ -20,6 +20,12 @@ c_f = /AL /c /W3 /Oxaz
2020
doobj.exe : doobj.obj
2121
link /E doobj.obj,$@,nul;
2222

23+
getslice.exe : getslice.obj
24+
link /E getslice.obj,$@,nul;
25+
26+
incbin.exe : incbin.obj
27+
link /E incbin.obj,$@,nul;
28+
2329
lbm2p.exe : lbm2p.obj
2430
link /E lbm2p.obj,$@,nul;
2531

WATER/MAKEFILE

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ bkg.uh: bkg.lbm
2222
-..\util\lbm2u bkg.lbm $@
2323

2424
bkg.inc: bkg.uh
25-
-..\credits\incbin bkg.uh $@
25+
..\util\incbin bkg.uh $@
2626

2727
wat1.inc: wat1.dat
28-
-..\credits\incbin wat1.dat $@
28+
..\util\incbin wat1.dat $@
2929

3030
wat2.inc: wat2.dat
31-
-..\credits\incbin wat2.dat $@
31+
..\util\incbin wat2.dat $@
3232

3333
wat3.inc: wat3.dat
34-
-..\credits\incbin wat3.dat $@
34+
..\util\incbin wat3.dat $@
3535

3636
wat4.inc: wat4.dat
37-
-..\credits\incbin wat4.dat $@
37+
..\util\incbin wat4.dat $@
3838

3939
miekka.uh: miekka.lbm
4040
-..\util\lbm2u miekka.lbm $@

0 commit comments

Comments
 (0)