Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
30fb17bd
Commit
30fb17bd
authored
Oct 25, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Add support for importing PE system libraries using the -l option.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d1248c8a
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
1 deletion
+14
-1
makedep.c
tools/makedep.c
+14
-1
No files found.
tools/makedep.c
View file @
30fb17bd
...
...
@@ -1411,6 +1411,7 @@ static struct file *open_include_file( const struct makefile *make, struct incl_
{
if
(
!
strcmp
(
pFile
->
name
,
"stdarg.h"
))
return
NULL
;
if
(
!
strcmp
(
pFile
->
name
,
"x86intrin.h"
))
return
NULL
;
if
(
make
->
include_paths
.
count
)
return
NULL
;
fprintf
(
stderr
,
"%s:%d: error: system header %s cannot be used with msvcrt
\n
"
,
pFile
->
included_by
->
file
->
name
,
pFile
->
included_line
,
pFile
->
name
);
exit
(
1
);
...
...
@@ -1961,6 +1962,7 @@ static struct strarray get_local_dependencies( const struct makefile *make, cons
static
const
char
*
get_static_lib
(
const
struct
makefile
*
make
,
const
char
*
name
)
{
if
(
!
make
->
staticlib
)
return
NULL
;
if
(
make
->
disabled
)
return
NULL
;
if
(
strncmp
(
make
->
staticlib
,
"lib"
,
3
))
return
NULL
;
if
(
strncmp
(
make
->
staticlib
+
3
,
name
,
strlen
(
name
)
))
return
NULL
;
if
(
strcmp
(
make
->
staticlib
+
3
+
strlen
(
name
),
".a"
))
return
NULL
;
...
...
@@ -2085,9 +2087,20 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
for
(
i
=
0
;
i
<
imports
.
count
;
i
++
)
{
const
char
*
name
=
get_base_name
(
imports
.
str
[
i
]
)
;
const
char
*
name
=
imports
.
str
[
i
]
;
const
char
*
lib
=
NULL
;
if
(
name
[
0
]
==
'-'
)
{
switch
(
name
[
1
])
{
case
'L'
:
strarray_add
(
&
ret
,
name
);
continue
;
case
'l'
:
name
+=
2
;
break
;
default:
continue
;
}
}
else
name
=
get_base_name
(
name
);
for
(
j
=
0
;
j
<
subdirs
.
count
;
j
++
)
{
if
(
submakes
[
j
]
->
importlib
&&
!
strcmp
(
submakes
[
j
]
->
importlib
,
name
))
...
...
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