From: Rémi Bernon <rbernon(a)codeweavers.com> --- tools/winegcc/winegcc.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 46a63453985..65460937c54 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -542,7 +542,7 @@ static struct strarray get_link_args( const char *output_name ) } if (is_unicode_app) strarray_add( &flags, "-municode" ); - if (subsystem) strarray_add( &flags, strmake( "-Wl,--subsystem,%s", subsystem ) ); + strarray_add( &flags, strmake( "-Wl,--subsystem,%s", subsystem ) ); strarray_add( &flags, "-Wl,--exclude-all-symbols" ); strarray_add( &flags, "-Wl,--nxcompat" ); @@ -598,7 +598,7 @@ static struct strarray get_link_args( const char *output_name ) if (entry_point) strarray_add( &flags, strmake( "-Wl,-entry:%s", entry_point )); - if (subsystem) strarray_add( &flags, strmake( "-Wl,--subsystem:%s", subsystem ) ); + strarray_add( &flags, strmake( "-Wl,--subsystem:%s", subsystem ) ); STRARRAY_FOR_EACH( file, &output_debug_files ) { @@ -1132,11 +1132,8 @@ static void build_spec_obj( const char *spec_file, const char *output_file, strarray_add(&spec_args, output_name); } - if (subsystem) - { - strarray_add( &spec_args, "--subsystem" ); - strarray_add( &spec_args, subsystem ); - } + strarray_add( &spec_args, "--subsystem" ); + strarray_add( &spec_args, subsystem ); if (!is_shared && large_address_aware) strarray_add( &spec_args, "--large-address-aware" ); @@ -1308,7 +1305,7 @@ static void build(struct strarray input_files, const char *output) if (!wine_objdir && !nodefaultlibs) { - if (subsystem && !strncmp( subsystem, "windows", 7 )) + if (!strncmp( subsystem, "windows", 7 )) { add_library(lib_dirs, &files, "shell32"); add_library(lib_dirs, &files, "comdlg32"); @@ -1338,7 +1335,7 @@ static void build(struct strarray input_files, const char *output) /* set default entry point, if needed */ if (!entry_point) { - if (subsystem && !strcmp( subsystem, "native" )) + if (!strcmp( subsystem, "native" )) entry_point = (is_pe && target.cpu == CPU_i386) ? "DriverEntry(a)8" : "DriverEntry"; else if (use_msvcrt && !is_shared && !is_win16_app) entry_point = is_unicode_app ? "wmainCRTStartup" : "mainCRTStartup"; @@ -1621,6 +1618,7 @@ int main(int argc, char **argv) includedir = get_includedir( bindir ); target = init_argv0_target( argv[0] ); path_dirs = strarray_frompath( getenv( "PATH" )); + subsystem = "console"; /* setup tmp file removal at exit */ atexit(clean_temp_files); @@ -1846,7 +1844,6 @@ int main(int argc, char **argv) { is_shared = true; raw_compiler_arg = raw_linker_arg = 0; - if (!subsystem) subsystem = "console"; } else if (strcmp("-s", args.str[i]) == 0) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9027