From 3b344ed8e749fa15b32f2cbe740a6aa90970aa87 Mon Sep 17 00:00:00 2001
From: Aaron Culliney <asc_at_bitr0t_com>
Date: Sun, 22 Jun 2014 11:25:57 -0700
Subject: [PATCH] Don't fail build if ROM generation fails

---
 Makefile.am  |  4 ++--
 src/genrom.c | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 6ca16c55..a9eb4705 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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 $^ > $@
diff --git a/src/genrom.c b/src/genrom.c
index 6738a7b6..59bba895 100644
--- a/src/genrom.c
+++ b/src/genrom.c
@@ -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
 }