ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

For each imported dll, check if there is a static library with the 

same base name as the import library, and if yes add it to the library
list.
This commit is contained in:
Alexandre Julliard 2005-05-09 14:38:06 +00:00
parent 424cc2a0a2
commit 61d01e6a3e
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/winegcc/winegcc.c
View File

@ -363,6 +363,15 @@ static const char* compile_to_object(struct options* opts, const char* file, con
return copts.output_name; return copts.output_name;
} }
/* check if there is a static lib associated to a given dll */
static char *find_static_lib( const char *dll )
{
char *lib = strmake("%s.a", dll);
if (get_file_type(lib) == file_arh) return lib;
free( lib );
return NULL;
}
static void build(struct options* opts) static void build(struct options* opts)
{ {
static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" }; static const char *stdlibpath[] = { DLLDIR, LIBDIR, "/usr/lib", "/usr/local/lib", "/lib" };
@ -469,7 +478,7 @@ static void build(struct options* opts)
} }
else if (file[1] == 'l') else if (file[1] == 'l')
{ {
char* fullname = 0; char *static_lib, *fullname = 0;
switch(get_lib_type(lib_dirs, file + 2, &fullname)) switch(get_lib_type(lib_dirs, file + 2, &fullname))
{ {
case file_arh: case file_arh:
@ -477,6 +486,11 @@ static void build(struct options* opts)
break; break;
case file_dll: case file_dll:
strarray_add(files, strmake("-d%s", file + 2)); strarray_add(files, strmake("-d%s", file + 2));
if ((static_lib = find_static_lib(fullname)))
{
strarray_add(files, strmake("-a%s",static_lib));
free(static_lib);
}
break; break;
case file_so: case file_so:
strarray_add(files, strmake("-s%s", file + 2)); strarray_add(files, strmake("-s%s", file + 2));