The -mno-cygwin flag is now deprecated with gcc. So modify a bit winegcc implementation of this option.
Alexandre Goujon
ale.goujon at gmail.com
Sat Mar 13 14:45:55 CST 2010
---
tools/winegcc/winegcc.c | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 852f105..1338de7 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -448,7 +448,14 @@ no_compat_defines:
strarray_add(comp_args, gcc_defs ? "-isystem" INCLUDEDIR "/windows" : "-I" INCLUDEDIR "/windows" );
}
else if (opts->wine_objdir)
+ {
strarray_add(comp_args, strmake("-I%s/include", opts->wine_objdir) );
+ if (opts->use_msvcrt)
+ {
+ strarray_add(comp_args, strmake("-I%s/include/msvcrt/", opts->wine_objdir) );
+ strarray_add(comp_args, "-lmsvcrt");
+ }
+ }
spawn(opts->prefix, comp_args, 0);
strarray_free(comp_args);
@@ -704,7 +711,6 @@ static void build(struct options* opts)
{
strarray_addall(link_args, get_translator(opts));
strarray_add(link_args, opts->gui_app ? "-mwindows" : "-mconsole");
- if (opts->use_msvcrt) strarray_add(link_args, "-mno-cygwin");
if (opts->nodefaultlibs) strarray_add(link_args, "-nodefaultlibs");
}
@@ -780,6 +786,12 @@ static void build(struct options* opts)
if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );
+ if(opts->use_msvcrt)
+ {
+ strarray_add(link_args, strmake("-L%s/dlls/msvcrt", opts->wine_objdir) );
+ strarray_add(link_args, "-lmsvcrt");
+ }
+
spawn(opts->prefix, link_args, 0);
strarray_free (resources);
strarray_free (link_args);
--
1.6.3.3
More information about the wine-patches
mailing list