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
96376059
Commit
96376059
authored
Feb 23, 2016
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Generate dependencies for default import libraries.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
90e7a735
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
0 deletions
+20
-0
makedep.c
tools/makedep.c
+20
-0
No files found.
tools/makedep.c
View file @
96376059
...
...
@@ -1988,6 +1988,23 @@ static struct strarray add_import_libs( const struct makefile *make, struct stra
/*******************************************************************
* get_default_imports
*/
static
struct
strarray
get_default_imports
(
const
struct
makefile
*
make
)
{
struct
strarray
ret
=
empty_strarray
;
if
(
strarray_exists
(
&
make
->
extradllflags
,
"-nodefaultlibs"
))
return
ret
;
if
(
strarray_exists
(
&
make
->
appmode
,
"-mno-cygwin"
))
strarray_add
(
&
ret
,
"msvcrt"
);
if
(
make
->
is_win16
)
strarray_add
(
&
ret
,
"kernel"
);
strarray_add
(
&
ret
,
"kernel32"
);
strarray_add
(
&
ret
,
"ntdll"
);
strarray_add
(
&
ret
,
"winecrt0"
);
return
ret
;
}
/*******************************************************************
* add_install_rule
*/
static
void
add_install_rule
(
const
struct
makefile
*
make
,
struct
strarray
*
install_rules
,
...
...
@@ -2527,6 +2544,7 @@ static struct strarray output_sources( const struct makefile *make )
spec_file
=
src_dir_path
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
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"
);
...
...
@@ -2758,6 +2776,7 @@ static struct strarray output_sources( const struct makefile *make )
struct
strarray
dep_libs
=
empty_strarray
;
struct
strarray
all_libs
=
add_import_libs
(
make
,
&
dep_libs
,
make
->
imports
,
0
);
add_import_libs
(
make
,
&
dep_libs
,
get_default_imports
(
make
),
0
);
/* dependencies only */
strarray_addall
(
&
all_libs
,
libs
);
strarray_add
(
&
all_targets
,
strmake
(
"%s%s"
,
testmodule
,
dll_ext
));
strarray_add
(
&
clean_files
,
strmake
(
"%s%s"
,
stripped
,
dll_ext
));
...
...
@@ -2805,6 +2824,7 @@ static struct strarray output_sources( const struct makefile *make )
dep_libs
=
empty_strarray
;
all_libs
=
add_import_libs
(
make
,
&
dep_libs
,
make
->
imports
,
1
);
add_import_libs
(
make
,
&
dep_libs
,
get_default_imports
(
make
),
1
);
/* dependencies only */
strarray_addall
(
&
all_libs
,
libs
);
strarray_add
(
&
clean_files
,
crosstest
);
output
(
"%s: %s
\n
"
,
obj_dir_path
(
make
,
"crosstest"
),
obj_dir_path
(
make
,
crosstest
));
...
...
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