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
fabc25d8
Commit
fabc25d8
authored
Nov 10, 2015
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Add support in make_makefiles for flags in sfd files.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
a3fcb8dc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
30 additions
and
10 deletions
+30
-10
Makefile.in
fonts/Makefile.in
+0
-4
make_makefiles
tools/make_makefiles
+30
-6
No files found.
fonts/Makefile.in
View file @
fabc25d8
...
...
@@ -11,7 +11,3 @@ FONT_SRCS = \
tahoma.sfd
\
tahomabd.sfd
\
wingding.sfd
# Make sure that make_makefiles sees the generated rules
install install-lib
::
clean
::
tools/make_makefiles
View file @
fabc25d8
...
...
@@ -266,13 +266,32 @@ sub get_makedep_flags($)
my
%
flags
;
open
FILE
,
$file
or
die
"cannot open $file"
;
while
(
<
FILE
>
)
if
(
$file
=~
/\.sfd$/
)
{
next
unless
/^#\s*pragma\s+makedep\s+(.*)/
;
foreach
my
$flag
(
split
/\s+/
,
$1
)
while
(
<
FILE
>
)
{
last
if
$flag
eq
"depend"
;
$flags
{
$flag
}
=
1
;
next
unless
/^UComments:\s*\"(.*)\"$/
;
foreach
my
$pragma
(
split
/\+AAoA/
,
$1
)
{
next
unless
$pragma
=~
/^#\s*pragma\s+makedep\s+(.*)/
;
foreach
my
$flag
(
split
/\s+/
,
$1
)
{
$flags
{
$flag
}
=
1
;
last
if
$flag
eq
"font"
;
}
}
}
}
else
{
while
(
<
FILE
>
)
{
next
unless
/^#\s*pragma\s+makedep\s+(.*)/
;
foreach
my
$flag
(
split
/\s+/
,
$1
)
{
last
if
$flag
eq
"depend"
;
$flags
{
$flag
}
=
1
;
}
}
}
close
FILE
;
...
...
@@ -342,7 +361,12 @@ sub assign_sources_to_makefiles(@)
elsif
(
$name
=~
/\.rh$/
)
{
push
@
{
$
{
$make
}{
"=HEADER_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.inl$/
)
{
push
@
{
$
{
$make
}{
"=HEADER_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.svg$/
)
{
push
@
{
$
{
$make
}{
"=SVG_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.sfd$/
)
{
push
@
{
$
{
$make
}{
"=FONT_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.sfd$/
)
{
$
{
$
{
$make
}{
"=flags"
}}{
"clean"
}
=
1
if
defined
$flags
{
"font"
};
$
{
$
{
$make
}{
"=flags"
}}{
"install-lib"
}
=
1
if
defined
$flags
{
"install"
};
push
@
{
$
{
$make
}{
"=FONT_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.c$/
)
{
$
{
$
{
$make
}{
"=flags"
}}{
"staticimplib"
}
=
1
if
defined
$flags
{
"implib"
};
...
...
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