One more place where OutputNameUsed must be flagged.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4844 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/ld65/config.c b/src/ld65/config.c
index f86aaaaf637dd3d6f443a1f3fcc8b983aa2a5ea6..96cf2a26e551e6b24752bd94ba9b2972bb9a9b1d 100644 (file)
--- a/src/ld65/config.c
+++ b/src/ld65/config.c
@@ -448,47 +448,47 @@ static void ParseMemory (void)
                    M->SizeExpr = CfgExpr ();
                    break;
 
-               case CFGTOK_TYPE:
-                   FlagAttr (&M->Attr, MA_TYPE, "TYPE");
-                   CfgSpecialToken (Types, ENTRY_COUNT (Types), "Type");
-                   if (CfgTok == CFGTOK_RO) {
-                       M->Flags |= MF_RO;
-                   }
+               case CFGTOK_TYPE:
+                   FlagAttr (&M->Attr, MA_TYPE, "TYPE");
+                   CfgSpecialToken (Types, ENTRY_COUNT (Types), "Type");
+                   if (CfgTok == CFGTOK_RO) {
+                       M->Flags |= MF_RO;
+                   }
                     CfgNextTok ();
-                   break;
+                   break;
 
                case CFGTOK_FILE:
-                   FlagAttr (&M->Attr, MA_FILE, "FILE");
-                   CfgAssureStr ();
+                   FlagAttr (&M->Attr, MA_FILE, "FILE");
+                   CfgAssureStr ();
                            /* Get the file entry and insert the memory area */
                    FileInsert (GetFile (GetStrBufId (&CfgSVal)), M);
                     CfgNextTok ();
-                   break;
+                   break;
 
                case CFGTOK_DEFINE:
-                   FlagAttr (&M->Attr, MA_DEFINE, "DEFINE");
-                   /* Map the token to a boolean */
-                   CfgBoolToken ();
-                   if (CfgTok == CFGTOK_TRUE) {
-                       M->Flags |= MF_DEFINE;
-                   }
+                   FlagAttr (&M->Attr, MA_DEFINE, "DEFINE");
+                   /* Map the token to a boolean */
+                   CfgBoolToken ();
+                   if (CfgTok == CFGTOK_TRUE) {
+                       M->Flags |= MF_DEFINE;
+                   }
                     CfgNextTok ();
-                   break;
+                   break;
 
                case CFGTOK_FILL:
-                   FlagAttr (&M->Attr, MA_FILL, "FILL");
-                   /* Map the token to a boolean */
-                   CfgBoolToken ();
-                   if (CfgTok == CFGTOK_TRUE) {
-                       M->Flags |= MF_FILL;
-                   }
+                   FlagAttr (&M->Attr, MA_FILL, "FILL");
+                   /* Map the token to a boolean */
+                   CfgBoolToken ();
+                   if (CfgTok == CFGTOK_TRUE) {
+                       M->Flags |= MF_FILL;
+                   }
                     CfgNextTok ();
-                   break;
+                   break;
 
                case CFGTOK_FILLVAL:
-                   FlagAttr (&M->Attr, MA_FILLVAL, "FILLVAL");
+                   FlagAttr (&M->Attr, MA_FILLVAL, "FILLVAL");
                    M->FillVal = (unsigned char) CfgCheckedConstExpr (0, 0xFF);
-                   break;
+                   break;
 
                default:
                    FAIL ("Unexpected attribute token");
@@ -511,6 +511,7 @@ static void ParseMemory (void)
         */
        if ((M->Attr & MA_FILE) == 0) {
            FileInsert (GetFile (GetStringId (OutputName)), M);
+           OutputNameUsed = 1;
        }
     }