Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-06-26 00:29:27 +00:00
Code Issues Projects Releases Wiki Activity

Don't fail build if ROM generation fails

Browse Source
This commit is contained in:
Aaron Culliney 2014-06-22 11:25:57 -07:00
parent 10e03e9bc5
commit 3b344ed8e7
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.am
View File

@ -73,8 +73,8 @@ genrom_SOURCES = src/genrom.c
src/font.c: src/font.txt genfont
./genfont < $< > $@
src/rom.c: src/rom/apple_IIe.rom src/rom/slot6.rom genrom
./genrom $^ > $@
src/rom.c: genrom
./genrom src/rom/apple_IIe.rom src/rom/slot6.rom > $@
src/x86/glue.S: src/disk.c src/misc.c src/display.c src/vm.c @AUDIO_GLUE_C@
./src/x86/genglue $^ > $@

12
src/genrom.c
View File

@ -67,13 +67,13 @@ int main(int argc, const char *argv[]) {
error = true;
do {
if (idx >= argc) {
fprintf(stderr, "rom file unspecified\n");
fprintf(stderr, "WARNING : rom file unspecified\n");
break;
}
fp = fopen(argv[idx], "r");
if (!fp) {
fprintf(stderr, "cannot open %s\n", argv[idx]);
fprintf(stderr, "WARNING : cannot open %s\n", argv[idx]);
break;
}
@ -84,14 +84,14 @@ int main(int argc, const char *argv[]) {
num = fread(buf, 1, sizes[idx], fp);
if (num != sizes[idx]) {
fprintf(stderr, "rom file size %d mismatched with expected %d\n", num, sizes[idx]);
fprintf(stderr, "WARNING : rom file size %u mismatched with expected %u\n", (unsigned int)num, (unsigned int)sizes[idx]);
break;
}
fclose(fp);
printf("\nbool %s = true;\n", bools[idx]);
printf("\nuint8_t %s[%u] = {", roms[idx], sizes[idx]);
printf("\nuint8_t %s[%u] = {", roms[idx], (unsigned int)sizes[idx]);
convert_rom(buf, sizes[idx]);
printf("\n};\n");
@ -100,7 +100,7 @@ int main(int argc, const char *argv[]) {
if (error) {
printf("\nbool %s = false;\n", bools[idx]);
printf("\nuint8_t %s[%u] = { 0 };\n", roms[idx], sizes[idx]);
printf("\nuint8_t %s[%u] = { 0 };\n", roms[idx], (unsigned int)sizes[idx]);
}
if (buf) {
@ -110,6 +110,6 @@ int main(int argc, const char *argv[]) {
} while(roms[++idx] != NULL);
return error;
return 0; // no error so build can continue
}