Tentative fix for bug #55. Thanks to ggn for reporting!

[rmac] / rmac.c

diff --git a/rmac.c b/rmac.c
index 0c663b40a0af0cca1b76faed1e2e73bad35f9f82..ba0f63cc54432fb413b15cc8ab9d51c2ee6c4039 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -133,6 +133,7 @@ void DisplayHelp(void)
                "  -n                Don't do things behind your back in RISC assembler\n"
                "  -o file           Output file name\n"
                "  -p[n]             Create an ST .prg (1=normal, 2=w/symbols)\n"
+               "                    Forces -fa\n"
                "  -r[size]          Pad segments to boundary size specified\n"
                "                    w: word (2 bytes, default alignment)\n"
                "                    l: long (4 bytes)\n"
@@ -317,6 +318,10 @@ int Process(int argc, char ** argv)
                                                ++errcnt;
                                                return errcnt;
                                }
+
+                               // Enforce Alcyon object format - kind of silly
+                               // to ask for .prg output without it!
+                               obj_format = ALCYON;
                                break;
                        case 'r':                               // Pad seg to requested boundary size
                        case 'R':
@@ -444,7 +449,6 @@ int Process(int argc, char ** argv)
 
                strcpy(fnbuf, firstfname);
                fext(fnbuf, (prg_flag ? ".prg" : ".o"), 1);
-               fext(fnbuf, ".o", 1);
                objfname = fnbuf;
        }