Add option to set preprocessor (not yet implemented).
Remove the -N option, which is equivalent to '-P cat'.
This commit is contained in:
parent
93a943eecc
commit
095322e271
|
@ -102,10 +102,10 @@ static char usage[] =
|
||||||
" -J Do not search the standard include path\n"
|
" -J Do not search the standard include path\n"
|
||||||
" -l lan Set default language to lan (default is neutral {0, 0})\n"
|
" -l lan Set default language to lan (default is neutral {0, 0})\n"
|
||||||
" -m Do not remap numerical resource IDs\n"
|
" -m Do not remap numerical resource IDs\n"
|
||||||
" -N Do not preprocess input\n"
|
|
||||||
" -o file Output to file (default is infile.[res|s]\n"
|
" -o file Output to file (default is infile.[res|s]\n"
|
||||||
" -O format The output format: one of `res', 'asm'.\n"
|
" -O format The output format: one of `res', 'asm'.\n"
|
||||||
" -p prefix Give a prefix for the generated names\n"
|
" -p prefix Give a prefix for the generated names\n"
|
||||||
|
" -P program Specifies the preprocessor to use, including arguments.\n"
|
||||||
" -s Add structure with win32/16 (PE/NE) resource directory\n"
|
" -s Add structure with win32/16 (PE/NE) resource directory\n"
|
||||||
" -v Enable verbose mode.\n"
|
" -v Enable verbose mode.\n"
|
||||||
" -V Print version and exit\n"
|
" -V Print version and exit\n"
|
||||||
|
@ -123,7 +123,7 @@ static char usage[] =
|
||||||
" --language Synonym for -l.\n"
|
" --language Synonym for -l.\n"
|
||||||
" --use-temp-file Ignored for compatibility with windres.\n"
|
" --use-temp-file Ignored for compatibility with windres.\n"
|
||||||
" --no-use-temp-file Ignored for compatibility with windres.\n"
|
" --no-use-temp-file Ignored for compatibility with windres.\n"
|
||||||
" --preprocessor Specify the preprocessor to use, including arguments.\n"
|
" --preprocessor Synonym for -P.\n"
|
||||||
" --help Synonym for -h.\n"
|
" --help Synonym for -h.\n"
|
||||||
" --version Synonym for -V.\n"
|
" --version Synonym for -V.\n"
|
||||||
#endif
|
#endif
|
||||||
|
@ -224,7 +224,7 @@ int byteorder = WRC_BO_NATIVE;
|
||||||
int preprocess_only = 0;
|
int preprocess_only = 0;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set when _not_ to run the preprocessor (-N option)
|
* Set when _not_ to run the preprocessor (-P cat option)
|
||||||
*/
|
*/
|
||||||
int no_preprocess = 0;
|
int no_preprocess = 0;
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ static void rm_tempfile(void);
|
||||||
static void segvhandler(int sig);
|
static void segvhandler(int sig);
|
||||||
|
|
||||||
static const char* short_options =
|
static const char* short_options =
|
||||||
"a:AbB:cC:d:D:eEF:ghH:i:I:Jl:LmnNo:O:p:rstTvVw:W";
|
"a:AbB:cC:d:D:eEF:ghH:i:I:Jl:LmnNo:O:p:P:rstTvVw:W";
|
||||||
#ifdef HAVE_GETOPT_LONG
|
#ifdef HAVE_GETOPT_LONG
|
||||||
static struct option long_options[] = {
|
static struct option long_options[] = {
|
||||||
{ "input", 1, 0, 'i' },
|
{ "input", 1, 0, 'i' },
|
||||||
|
@ -263,7 +263,7 @@ static struct option long_options[] = {
|
||||||
{ "language", 1, 0, 'l' },
|
{ "language", 1, 0, 'l' },
|
||||||
{ "version", 0, 0, 'V' },
|
{ "version", 0, 0, 'V' },
|
||||||
{ "help", 0, 0, 'h' },
|
{ "help", 0, 0, 'h' },
|
||||||
{ "preprocessor", 1, 0, 1 },
|
{ "preprocessor", 1, 0, 'P' },
|
||||||
{ "use-temp-file", 0, 0, 2 },
|
{ "use-temp-file", 0, 0, 2 },
|
||||||
{ "no-use-temp-file", 0, 0, 3 },
|
{ "no-use-temp-file", 0, 0, 3 },
|
||||||
{ 0, 0, 0, 0 }
|
{ 0, 0, 0, 0 }
|
||||||
|
@ -311,9 +311,6 @@ int main(int argc,char *argv[])
|
||||||
{
|
{
|
||||||
switch(optc)
|
switch(optc)
|
||||||
{
|
{
|
||||||
case 1:
|
|
||||||
fprintf(stderr, "--preprocessor option not yet supported, ignored.\n");
|
|
||||||
break;
|
|
||||||
case 2:
|
case 2:
|
||||||
fprintf(stderr, "--use-temp-file option not yet supported, ignored.\n");
|
fprintf(stderr, "--use-temp-file option not yet supported, ignored.\n");
|
||||||
break;
|
break;
|
||||||
|
@ -392,9 +389,6 @@ int main(int argc,char *argv[])
|
||||||
case 'm':
|
case 'm':
|
||||||
remap = 0;
|
remap = 0;
|
||||||
break;
|
break;
|
||||||
case 'N':
|
|
||||||
no_preprocess = 1;
|
|
||||||
break;
|
|
||||||
case 'o':
|
case 'o':
|
||||||
if (!output_name) output_name = strdup(optarg);
|
if (!output_name) output_name = strdup(optarg);
|
||||||
else error("Too many output files.\n");
|
else error("Too many output files.\n");
|
||||||
|
@ -407,6 +401,10 @@ int main(int argc,char *argv[])
|
||||||
case 'p':
|
case 'p':
|
||||||
prefix = xstrdup(optarg);
|
prefix = xstrdup(optarg);
|
||||||
break;
|
break;
|
||||||
|
case 'P':
|
||||||
|
if (strcmp(optarg, "cat") == 0) no_preprocess = 1;
|
||||||
|
else fprintf(stderr, "-P option not yet supported, ignored.\n");
|
||||||
|
break;
|
||||||
case 's':
|
case 's':
|
||||||
create_dir = 1;
|
create_dir = 1;
|
||||||
break;
|
break;
|
||||||
|
@ -528,11 +526,6 @@ int main(int argc,char *argv[])
|
||||||
{
|
{
|
||||||
error("Option -E and -b cannot be used together\n");
|
error("Option -E and -b cannot be used together\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
if(no_preprocess)
|
|
||||||
{
|
|
||||||
error("Option -E and -N cannot be used together\n");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Set alignment power */
|
/* Set alignment power */
|
||||||
|
|
|
@ -105,11 +105,6 @@ for example, big\-endian platforms. The \fI\-m\fR option is usefull for
|
||||||
source\-files that contain overlapping type\-IDs, or when the format of the
|
source\-files that contain overlapping type\-IDs, or when the format of the
|
||||||
resource is not 100% compliant.
|
resource is not 100% compliant.
|
||||||
.TP
|
.TP
|
||||||
.I \-N
|
|
||||||
Do not preprocess the input. This will most certainly result in
|
|
||||||
compilation failure, unless you have preprocessed the source with
|
|
||||||
another preprocessor before passing it to \fBwrc\fR.
|
|
||||||
.TP
|
|
||||||
.I \-o file
|
.I \-o file
|
||||||
Write output to \fIfile\fR. Default is \fBinputfile.{res,s,h}\fR
|
Write output to \fIfile\fR. Default is \fBinputfile.{res,s,h}\fR
|
||||||
with \fB.rc\fR stripped or \fBwrc.tab.{s,h,res}\fR, depending on the
|
with \fB.rc\fR stripped or \fBwrc.tab.{s,h,res}\fR, depending on the
|
||||||
|
@ -125,6 +120,11 @@ Prefix all generated names with \fIprefix\fR. This is only relevant for
|
||||||
names in the assembly code and header file. Resource names are not
|
names in the assembly code and header file. Resource names are not
|
||||||
affected.
|
affected.
|
||||||
.TP
|
.TP
|
||||||
|
.I \-P program
|
||||||
|
This option may be used to specify the preprocessor to use, including any
|
||||||
|
leading arguments. If not specified, \fBwrc\fR uses its builtin processor.
|
||||||
|
To disable preprocessing, use \fB-P cat\fR.
|
||||||
|
.TP
|
||||||
.I \-s
|
.I \-s
|
||||||
Add structure with win32/16 (PE/NE) resource directory to outputfile.
|
Add structure with win32/16 (PE/NE) resource directory to outputfile.
|
||||||
This directory is always in native byteorder.
|
This directory is always in native byteorder.
|
||||||
|
|
Loading…
Reference in New Issue