Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
61d01e6a
Commit
61d01e6a
authored
May 09, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
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.
parent
424cc2a0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
1 deletion
+15
-1
winegcc.c
tools/winegcc/winegcc.c
+15
-1
No files found.
tools/winegcc/winegcc.c
View file @
61d01e6a
...
@@ -363,6 +363,15 @@ static const char* compile_to_object(struct options* opts, const char* file, con
...
@@ -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)
...
@@ -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)
...
@@ -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
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment