Alexandre Julliard : winegcc: Force importing msvcrt when using the Unicode hack for a Windows build.

Alexandre Julliard julliard at winehq.org
Fri Mar 19 11:16:40 CDT 2010


Module: wine
Branch: master
Commit: 561a3e643ea8b35adfc032d3afa979c622fcec23
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=561a3e643ea8b35adfc032d3afa979c622fcec23

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Fri Mar 19 13:59:54 2010 +0100

winegcc: Force importing msvcrt when using the Unicode hack for a Windows build.

Based on a patch by Alexandre Goujon.

---

 tools/winegcc/winegcc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 852f105..396bcc8 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -704,7 +704,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");
         }
 
@@ -777,6 +776,7 @@ static void build(struct options* opts)
                 break;
             }
         }
+        if (!opts->shared && (opts->use_msvcrt || opts->unicode_app)) strarray_add(link_args, "-lmsvcrt");
 
         if (res_o_name) compile_resources_to_object( opts, resources, res_o_name );
 




More information about the wine-cvs mailing list