[Resend winegcc03] winewrap can handle the default output name
Richard Cohen
richard.cohen at virgin.net
Tue Sep 9 13:08:10 CDT 2003
Slightly different from last time.
> Default name that mingw uses is a.exe
> This also stops winewrap from segfaulting when passed no arguments.
Changelog
Handle default linker output name (a.exe) in winewrap instead of
winegcc
-------------- next part --------------
diff -u -r -N tools.0/winegcc.c tools.3/winegcc.c
--- tools.0/winegcc.c 2003-09-05 06:30:17.000000000 +0100
+++ tools.3/winegcc.c 2003-09-08 15:18:38.000000000 +0100
@@ -215,7 +215,6 @@
i = 0;
if (linking)
{
- int has_output_name = 0;
int has_input_files = 0;
char **temp_argv;
@@ -242,7 +241,6 @@
gcc_argv[i++] = argv[++j];
temp_argv[j] = 0;
}
- has_output_name = 1;
break;
case 'l':
gcc_argv[i++] = strcmp(argv[j], "-luuid") ? argv[j] : "-lwine_uuid";
@@ -262,12 +260,6 @@
if (has_input_files)
{
- /* Support the a.out default name, to appease configure */
- if (!has_output_name)
- {
- gcc_argv[i++] = "-o";
- gcc_argv[i++] = "a.out";
- }
if (use_stdlib && use_msvcrt) gcc_argv[i++] = "-lmsvcrt";
if (gui_app) gcc_argv[i++] = "-lcomdlg32";
gcc_argv[i++] = "-ladvapi32";
diff -u -r -N tools.0/winewrap.c tools/winewrap.c
--- tools.0/winewrap.c 2003-08-20 13:08:46.000000000 +0100
+++ tools/winewrap.c 2003-09-08 15:17:27.000000000 +0100
@@ -212,7 +212,9 @@
"}\n"
;
-static char *output_name;
+/* Default output name is the same as mingw-ld */
+static char *output_name = "a.exe";
+
static char **arh_files, **dll_files, **lib_files, **lib_paths, **obj_files;
static int nb_arh_files, nb_dll_files, nb_lib_files, nb_lib_paths, nb_obj_files;
static int verbose = 0;
More information about the wine-patches
mailing list