Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
f2d60c16
Commit
f2d60c16
authored
4 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
makefiles: Add separate variable to keep track of source dir font files.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
9a542f9d
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
tools/makedep.c
+3
-1
3 additions, 1 deletion
tools/makedep.c
with
3 additions
and
1 deletion
tools/makedep.c
+
3
−
1
View file @
f2d60c16
...
...
@@ -217,6 +217,7 @@ struct makefile
struct
strarray
crossobj_files
;
struct
strarray
unixobj_files
;
struct
strarray
res_files
;
struct
strarray
font_files
;
struct
strarray
c2man_files
;
struct
strarray
debug_files
;
struct
strarray
dlldata_files
;
...
...
@@ -2935,7 +2936,7 @@ static void output_source_sfd( struct makefile *make, struct incl_file *source,
output
(
"%s: %s
\n
"
,
ttf_file
,
source
->
filename
);
output
(
"
\t
%s -script %s %s $@
\n
"
,
fontforge
,
top_src_dir_path
(
make
,
"fonts/genttf.ff"
),
source
->
filename
);
if
(
!
(
source
->
file
->
flags
&
FLAG_SFD_FONTS
))
output
(
"all: %s
\n
"
,
ttf_
file
);
if
(
!
(
source
->
file
->
flags
&
FLAG_SFD_FONTS
))
strarray_add
(
&
make
->
font_files
,
ttf_
obj
);
}
if
(
source
->
file
->
flags
&
FLAG_INSTALL
)
{
...
...
@@ -3982,6 +3983,7 @@ static void output_sources( struct makefile *make )
{
output
(
"%s:"
,
obj_dir_path
(
make
,
"all"
));
output_filenames_obj_dir
(
make
,
make
->
all_targets
);
output_filenames_obj_dir
(
make
,
make
->
font_files
);
output
(
"
\n
"
);
strarray_add_uniq
(
&
make
->
phony_targets
,
obj_dir_path
(
make
,
"all"
));
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment