Handle default linker output name in winewrap instead of winegcc.
This commit is contained in:
parent
5bcf35a385
commit
6bfd84a331
|
@ -167,10 +167,8 @@ int main(int argc, char **argv)
|
|||
|
||||
gcc_argv = strarray_alloc();
|
||||
|
||||
i = 0;
|
||||
if (linking)
|
||||
{
|
||||
int has_output_name = 0;
|
||||
int has_input_files = 0;
|
||||
|
||||
strarray *copy_argv;
|
||||
|
@ -202,7 +200,6 @@ int main(int argc, char **argv)
|
|||
argv[j] = 0;
|
||||
strarray_add(gcc_argv, argv[++j]);
|
||||
}
|
||||
has_output_name = 1;
|
||||
argv[j] = 0;
|
||||
break;
|
||||
case 'l':
|
||||
|
@ -223,12 +220,6 @@ int main(int argc, char **argv)
|
|||
|
||||
if (has_input_files)
|
||||
{
|
||||
/* Support the a.out default name, to appease configure */
|
||||
if (!has_output_name)
|
||||
{
|
||||
strarray_add(gcc_argv, "-o");
|
||||
strarray_add(gcc_argv, "a.out");
|
||||
}
|
||||
if (use_stdlib && use_msvcrt) strarray_add(gcc_argv, "-lmsvcrt");
|
||||
if (gui_app) strarray_add(gcc_argv, "-lcomdlg32");
|
||||
strarray_add(gcc_argv, "-ladvapi32");
|
||||
|
|
|
@ -210,7 +210,7 @@ static const char *wrapper_code =
|
|||
"}\n"
|
||||
;
|
||||
|
||||
static char *output_name;
|
||||
static char *output_name = "a.out";
|
||||
static strarray *arh_files, *dll_files, *lib_files, *llib_paths, *lib_paths, *obj_files;
|
||||
static int keep_generated = 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue