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
3ebbfd5b
Commit
3ebbfd5b
authored
Feb 24, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Explicitly import libwine only for Windows builds.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
262a41ca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
makedep.c
tools/makedep.c
+3
-3
No files found.
tools/makedep.c
View file @
3ebbfd5b
...
...
@@ -2545,13 +2545,12 @@ static struct strarray output_sources( const struct makefile *make )
strarray_addall
(
&
all_libs
,
add_import_libs
(
make
,
&
dep_libs
,
make
->
delayimports
,
0
));
strarray_addall
(
&
all_libs
,
add_import_libs
(
make
,
&
dep_libs
,
make
->
imports
,
0
));
add_import_libs
(
make
,
&
dep_libs
,
get_default_imports
(
make
),
0
);
/* dependencies only */
for
(
i
=
0
;
i
<
make
->
delayimports
.
count
;
i
++
)
strarray_add
(
&
all_libs
,
strmake
(
"-Wb,-d%s"
,
make
->
delayimports
.
str
[
i
]
));
strarray_add
(
&
all_libs
,
"-lwine"
);
strarray_addall
(
&
all_libs
,
add_default_libraries
(
make
,
&
dep_libs
));
if
(
*
dll_ext
)
{
for
(
i
=
0
;
i
<
make
->
delayimports
.
count
;
i
++
)
strarray_add
(
&
all_libs
,
strmake
(
"-Wb,-d%s"
,
make
->
delayimports
.
str
[
i
]
));
strarray_add
(
&
all_targets
,
strmake
(
"%s%s"
,
make
->
module
,
dll_ext
));
strarray_add
(
&
all_targets
,
strmake
(
"%s.fake"
,
make
->
module
));
add_install_rule
(
make
,
install_rules
,
make
->
module
,
strmake
(
"%s%s"
,
make
->
module
,
dll_ext
),
...
...
@@ -2562,6 +2561,7 @@ static struct strarray output_sources( const struct makefile *make )
}
else
{
strarray_add
(
&
all_libs
,
"-lwine"
);
strarray_add
(
&
all_targets
,
make
->
module
);
add_install_rule
(
make
,
install_rules
,
make
->
module
,
make
->
module
,
strmake
(
"p$(%s)/%s"
,
spec_file
?
"dlldir"
:
"bindir"
,
make
->
module
));
...
...
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