Jacek Caban : winegcc: Use imported crt DLL instead of msvcrt if specified.
Alexandre Julliard
julliard at winehq.org
Tue Aug 6 17:41:59 CDT 2019
Module: wine
Branch: master
Commit: b64187c99823156af6ff76fb74455c024fe521e0
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b64187c99823156af6ff76fb74455c024fe521e0
Author: Jacek Caban <jacek at codeweavers.com>
Date: Tue Aug 6 12:24:19 2019 +0200
winegcc: Use imported crt DLL instead of msvcrt if specified.
Makes winecrt0 use specified crt DLL instead of msvcrt.dll.
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
tools/winegcc/winegcc.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 3d1817a..222c750 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -897,6 +897,7 @@ static void build(struct options* opts)
const char *spec_o_name;
const char *output_name, *spec_file, *lang;
int generate_app_loader = 1;
+ const char* crt_lib = NULL;
int fake_module = 0;
int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN);
unsigned int j;
@@ -982,8 +983,15 @@ static void build(struct options* opts)
strarray_add(files, strmake("-o%s", file));
break;
case file_arh:
- strarray_add(files, strmake("-a%s", file));
- break;
+ if (opts->use_msvcrt)
+ {
+ const char *p = strrchr(file, '/');
+ if (p) p++;
+ else p = file;
+ if (!strncmp(p, "libmsvcr", 8) || !strncmp(p, "libucrt", 7)) crt_lib = file;
+ }
+ strarray_add(files, strmake("-a%s", file));
+ break;
case file_so:
strarray_add(files, strmake("-s%s", file));
break;
@@ -1018,8 +1026,12 @@ static void build(struct options* opts)
if (!opts->nodefaultlibs)
{
- if (opts->use_msvcrt) add_library(opts, lib_dirs, files, "msvcrt");
add_library(opts, lib_dirs, files, "winecrt0");
+ if (opts->use_msvcrt)
+ {
+ if (!crt_lib) add_library(opts, lib_dirs, files, "msvcrt");
+ else strarray_add(files, strmake("-a%s", crt_lib));
+ }
if (opts->win16_app) add_library(opts, lib_dirs, files, "kernel");
add_library(opts, lib_dirs, files, "kernel32");
add_library(opts, lib_dirs, files, "ntdll");
More information about the wine-cvs
mailing list