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
665ebe2a
Commit
665ebe2a
authored
Nov 14, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Do not install external libraries.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9248dbaf
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
14 deletions
+19
-14
makedep.c
tools/makedep.c
+19
-14
No files found.
tools/makedep.c
View file @
665ebe2a
...
...
@@ -3053,7 +3053,7 @@ static void output_source_default( struct makefile *make, struct incl_file *sour
int
need_obj
=
((
*
dll_ext
||
!
(
source
->
file
->
flags
&
FLAG_C_UNIX
))
&&
(
!
need_cross
||
(
source
->
file
->
flags
&
FLAG_C_IMPLIB
)
||
make
->
staticlib
));
(
make
->
staticlib
&&
!
make
->
extlib
)
));
if
((
source
->
file
->
flags
&
FLAG_GENERATED
)
&&
(
!
make
->
testdll
||
!
strendswith
(
source
->
filename
,
"testlist.c"
)))
...
...
@@ -3422,17 +3422,21 @@ static void output_module( struct makefile *make )
*/
static
void
output_static_lib
(
struct
makefile
*
make
)
{
strarray_add
(
&
make
->
clean_files
,
make
->
staticlib
);
output
(
"%s: %s"
,
obj_dir_path
(
make
,
make
->
staticlib
),
tools_path
(
make
,
"winebuild"
));
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output
(
"
\n
"
);
output
(
"
\t
%s%s -w --staticlib -o $@"
,
cmd_prefix
(
"BUILD"
),
tools_path
(
make
,
"winebuild"
));
output_filenames
(
target_flags
);
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output
(
"
\n
"
);
add_install_rule
(
make
,
make
->
staticlib
,
make
->
staticlib
,
strmake
(
"d%s/%s"
,
so_dir
,
make
->
staticlib
));
if
(
!
crosstarget
||
!
make
->
extlib
)
{
strarray_add
(
&
make
->
clean_files
,
make
->
staticlib
);
output
(
"%s: %s"
,
obj_dir_path
(
make
,
make
->
staticlib
),
tools_path
(
make
,
"winebuild"
));
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output
(
"
\n
"
);
output
(
"
\t
%s%s -w --staticlib -o $@"
,
cmd_prefix
(
"BUILD"
),
tools_path
(
make
,
"winebuild"
));
output_filenames
(
target_flags
);
output_filenames_obj_dir
(
make
,
make
->
object_files
);
output_filenames_obj_dir
(
make
,
make
->
unixobj_files
);
output
(
"
\n
"
);
add_install_rule
(
make
,
make
->
staticlib
,
make
->
staticlib
,
strmake
(
"d%s/%s"
,
so_dir
,
make
->
staticlib
));
}
if
(
crosstarget
)
{
char
*
name
=
replace_extension
(
make
->
staticlib
,
".a"
,
".cross.a"
);
...
...
@@ -3445,8 +3449,9 @@ static void output_static_lib( struct makefile *make )
tools_path
(
make
,
"winebuild"
),
crosstarget
);
output_filenames_obj_dir
(
make
,
make
->
crossobj_files
);
output
(
"
\n
"
);
add_install_rule
(
make
,
make
->
staticlib
,
name
,
strmake
(
"d%s/%s"
,
pe_dir
,
make
->
staticlib
));
if
(
!
make
->
extlib
)
add_install_rule
(
make
,
make
->
staticlib
,
name
,
strmake
(
"d%s/%s"
,
pe_dir
,
make
->
staticlib
));
}
}
...
...
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