Changeset 3417


Ignore:
Timestamp:
Jun 13, 2007, 7:58:20 PM (18 years ago)
Author:
bird
Message:

Ignore PACKData and NOPACKData in wlink mode.

Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/libc-0.6/src/emx/src/emxomf/emxomfld.c

    r3290 r3417  
    164164static const char *linker_type = "VAC365";
    165165
    166 /* The name of the resource compiler to use.  By default, rc is used. 
     166/* The name of the resource compiler to use.  By default, rc is used.
    167167   This can be overridden with the EMXOMFLD_RC environment variable. */
    168168static const char *rc_name = "rc.exe";
    169169
    170 /* The type of resource compiler to use. By default we assume it's 
    171    IBM resource compiler. This can be overridden with the EMXOMFLD_RC_TYPE 
     170/* The type of resource compiler to use. By default we assume it's
     171   IBM resource compiler. This can be overridden with the EMXOMFLD_RC_TYPE
    172172   env. var. using any of the values RC, WRC. */
    173173static const char *rc_type = "RC";
    … …  
    21182118              if (errno || *t)
    21192119                {
    2120                   fprintf(stderr, "emxomfld: Number conversion failed: '%s'\n", pcur->name);
     2120                  fprintf (stderr, "emxomfld: Number conversion failed: '%s'\n", pcur->name);
    21212121                  return 1;
    21222122                }
    … …  
    21262126          else if (!strnicmp (&pcur->name[1], "PACKCODE", MAX (cchOpt, 5))
    21272127                || !strnicmp (&pcur->name[1], "NOPACKCODE", MAX (cchOpt, 3))
     2128                || !strnicmp (&pcur->name[1], "PACKDATA", MAX (cchOpt, 5))
     2129                || !strnicmp (&pcur->name[1], "NOPACKDATA", MAX (cchOpt, 7))
    21282130                || !strnicmp (&pcur->name[1], "EXEPACK", MAX (cchOpt, 1))
    21292131                || !strnicmp (&pcur->name[1], "NOEXEPACK", MAX (cchOpt, 5))
    … …  
    21312133                || !strnicmp (&pcur->name[1], "NODBGPACK", MAX (cchOpt, 4))
    21322134                )
    2133             fprintf(stderr, "emxomfld: warning: ignoring ilink option '%s'\n", pcur->name);
     2135            fprintf (stderr, "emxomfld: warning: ignoring ilink option '%s'\n", pcur->name);
    21342136          else
    21352137            continue;
    … …  
    23252327      /* EMXOMFLD_RC_TYPE contains RC or WRC if set. If non of these
    23262328         we assume RC.
    2327          EMXOMFLD_RC contains the compiler name and perhaps extra 
     2329         EMXOMFLD_RC contains the compiler name and perhaps extra
    23282330         arguments. If not set we'll use the default compiler, rc.exe. */
    23292331

  • trunk/emx/src/emxomf/emxomfld.c

    r3290 r3417  
    164164static const char *linker_type = "WLINK";
    165165
    166 /* The name of the resource compiler to use.  By default, rc is used. 
     166/* The name of the resource compiler to use.  By default, rc is used.
    167167   This can be overridden with the EMXOMFLD_RC environment variable. */
    168168static const char *rc_name = "rc.exe";
    169169
    170 /* The type of resource compiler to use. By default we assume it's 
    171    IBM resource compiler. This can be overridden with the EMXOMFLD_RC_TYPE 
     170/* The type of resource compiler to use. By default we assume it's
     171   IBM resource compiler. This can be overridden with the EMXOMFLD_RC_TYPE
    172172   env. var. using any of the values RC, WRC. */
    173173static const char *rc_type = "RC";
    … …  
    21182118              if (errno || *t)
    21192119                {
    2120                   fprintf(stderr, "emxomfld: Number conversion failed: '%s'\n", pcur->name);
     2120                  fprintf (stderr, "emxomfld: Number conversion failed: '%s'\n", pcur->name);
    21212121                  return 1;
    21222122                }
    … …  
    21262126          else if (!strnicmp (&pcur->name[1], "PACKCODE", MAX (cchOpt, 5))
    21272127                || !strnicmp (&pcur->name[1], "NOPACKCODE", MAX (cchOpt, 3))
     2128                || !strnicmp (&pcur->name[1], "PACKDATA", MAX (cchOpt, 5))
     2129                || !strnicmp (&pcur->name[1], "NOPACKDATA", MAX (cchOpt, 7))
    21282130                || !strnicmp (&pcur->name[1], "EXEPACK", MAX (cchOpt, 1))
    21292131                || !strnicmp (&pcur->name[1], "NOEXEPACK", MAX (cchOpt, 5))
    … …  
    21312133                || !strnicmp (&pcur->name[1], "NODBGPACK", MAX (cchOpt, 4))
    21322134                )
    2133             fprintf(stderr, "emxomfld: warning: ignoring ilink option '%s'\n", pcur->name);
     2135            fprintf (stderr, "emxomfld: warning: ignoring ilink option '%s'\n", pcur->name);
    21342136          else
    21352137            continue;
    … …  
    23252327      /* EMXOMFLD_RC_TYPE contains RC or WRC if set. If non of these
    23262328         we assume RC.
    2327          EMXOMFLD_RC contains the compiler name and perhaps extra 
     2329         EMXOMFLD_RC contains the compiler name and perhaps extra
    23282330         arguments. If not set we'll use the default compiler, rc.exe. */
    23292331
Note: See TracChangeset for help on using the changeset viewer.