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
f153ca0d
Commit
f153ca0d
authored
Nov 23, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makedep: Unify the various code paths for module generation.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
1ef7dd2d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
29 deletions
+16
-29
makedep.c
tools/makedep.c
+16
-29
No files found.
tools/makedep.c
View file @
f153ca0d
...
...
@@ -3125,8 +3125,9 @@ static void output_module( struct makefile *make )
struct
strarray
all_libs
=
empty_strarray
;
struct
strarray
dep_libs
=
empty_strarray
;
struct
strarray
imports
=
make
->
imports
;
char
*
module_path
=
obj_dir_path
(
make
,
make
->
module
);
const
char
*
debug_file
=
NULL
;
char
*
module_name
=
strmake
(
"%s%s"
,
make
->
module
,
make
->
is_cross
?
""
:
dll_ext
);
const
char
*
debug_file
;
const
char
*
delay_load
=
delay_load_flag
;
char
*
spec_file
=
NULL
;
unsigned
int
i
;
...
...
@@ -3143,39 +3144,24 @@ static void output_module( struct makefile *make )
strarray_addall
(
&
all_libs
,
libs
);
}
if
(
make
->
is_cross
)
{
if
(
delay_load_flag
)
{
for
(
i
=
0
;
i
<
make
->
delayimports
.
count
;
i
++
)
strarray_add
(
&
all_libs
,
strmake
(
"%s%s%s"
,
delay_load_flag
,
make
->
delayimports
.
str
[
i
],
strchr
(
make
->
delayimports
.
str
[
i
],
'.'
)
?
""
:
".dll"
));
}
strarray_add
(
&
make
->
all_targets
,
strmake
(
"%s"
,
make
->
module
));
add_install_rule
(
make
,
make
->
module
,
strmake
(
"%s"
,
make
->
module
),
strmake
(
"c%s/%s"
,
pe_dir
,
make
->
module
));
debug_file
=
get_debug_file
(
make
,
make
->
module
);
output
(
"%s:"
,
module_path
);
}
else
if
(
*
dll_ext
)
if
(
!
make
->
is_cross
&&
*
dll_ext
)
delay_load
=
"-Wl,-delayload,"
;
if
(
delay_load
)
{
for
(
i
=
0
;
i
<
make
->
delayimports
.
count
;
i
++
)
strarray_add
(
&
all_libs
,
strmake
(
"
-Wl,-delayload,%s%s"
,
make
->
delayimports
.
str
[
i
],
strarray_add
(
&
all_libs
,
strmake
(
"
%s%s%s"
,
delay_load
,
make
->
delayimports
.
str
[
i
],
strchr
(
make
->
delayimports
.
str
[
i
],
'.'
)
?
""
:
".dll"
));
strarray_add
(
&
make
->
all_targets
,
strmake
(
"%s%s"
,
make
->
module
,
dll_ext
));
add_install_rule
(
make
,
make
->
module
,
strmake
(
"%s%s"
,
make
->
module
,
dll_ext
),
strmake
(
"p%s/%s%s"
,
so_dir
,
make
->
module
,
dll_ext
));
output
(
"%s%s:"
,
module_path
,
dll_ext
);
}
strarray_add
(
&
make
->
all_targets
,
module_name
);
if
(
make
->
is_cross
)
add_install_rule
(
make
,
make
->
module
,
module_name
,
strmake
(
"c%s/%s"
,
pe_dir
,
module_name
));
else
if
(
*
dll_ext
)
add_install_rule
(
make
,
make
->
module
,
module_name
,
strmake
(
"p%s/%s"
,
so_dir
,
module_name
));
else
{
strarray_add
(
&
make
->
all_targets
,
make
->
module
);
add_install_rule
(
make
,
make
->
module
,
make
->
module
,
strmake
(
"p$(%s)/%s"
,
spec_file
?
"dlldir"
:
"bindir"
,
make
->
module
));
debug_file
=
get_debug_file
(
make
,
make
->
module
);
output
(
"%s:"
,
module_path
);
}
add_install_rule
(
make
,
make
->
module
,
module_name
,
strmake
(
"p$(%s)/%s"
,
spec_file
?
"dlldir"
:
"bindir"
,
module_name
));
output
(
"%s:"
,
obj_dir_path
(
make
,
module_name
));
if
(
spec_file
)
output_filename
(
spec_file
);
output_filenames_obj_dir
(
make
,
make
->
is_cross
?
make
->
crossobj_files
:
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
res_files
);
...
...
@@ -3193,6 +3179,7 @@ static void output_module( struct makefile *make )
output_filenames
(
make
->
extradllflags
);
output_filenames_obj_dir
(
make
,
make
->
is_cross
?
make
->
crossobj_files
:
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
res_files
);
debug_file
=
get_debug_file
(
make
,
make
->
module
);
if
(
debug_file
)
output_filename
(
strmake
(
"-Wl,--debug-file,%s"
,
obj_dir_path
(
make
,
debug_file
)));
output_filenames
(
all_libs
);
output_filename
(
make
->
is_cross
?
"$(CROSSLDFLAGS)"
:
"$(LDFLAGS)"
);
...
...
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