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
00c57ad8
Commit
00c57ad8
authored
Dec 21, 2018
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Add support for sharing resource files with parent dll.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
f6896e06
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
1 deletion
+6
-1
Makefile.in
dlls/dinput8/Makefile.in
+1
-0
make_makefiles
tools/make_makefiles
+1
-0
makedep.c
tools/makedep.c
+4
-1
No files found.
dlls/dinput8/Makefile.in
View file @
00c57ad8
...
@@ -21,4 +21,5 @@ C_SRCS = \
...
@@ -21,4 +21,5 @@ C_SRCS = \
IDL_SRCS
=
dinput8.idl
IDL_SRCS
=
dinput8.idl
RC_SRCS
=
\
RC_SRCS
=
\
dinput.rc
\
version.rc
version.rc
tools/make_makefiles
View file @
00c57ad8
...
@@ -404,6 +404,7 @@ sub assign_sources_to_makefiles(@)
...
@@ -404,6 +404,7 @@ sub assign_sources_to_makefiles(@)
my
$parent
=
get_parent_makefile
(
$file
);
my
$parent
=
get_parent_makefile
(
$file
);
next
unless
$parent
;
next
unless
$parent
;
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"C_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"C_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"RC_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"IDL_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"IDL_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"LEX_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"LEX_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"BISON_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"BISON_SRCS"
);
...
...
tools/makedep.c
View file @
00c57ad8
...
@@ -89,6 +89,7 @@ struct incl_file
...
@@ -89,6 +89,7 @@ struct incl_file
#define FLAG_GENERATED 0x000001
/* generated file */
#define FLAG_GENERATED 0x000001
/* generated file */
#define FLAG_INSTALL 0x000002
/* file to install */
#define FLAG_INSTALL 0x000002
/* file to install */
#define FLAG_PARENTDIR 0x000004
/* file comes from parent dir */
#define FLAG_IDL_PROXY 0x000100
/* generates a proxy (_p.c) file */
#define FLAG_IDL_PROXY 0x000100
/* generates a proxy (_p.c) file */
#define FLAG_IDL_CLIENT 0x000200
/* generates a client (_c.c) file */
#define FLAG_IDL_CLIENT 0x000200
/* generates a client (_c.c) file */
#define FLAG_IDL_SERVER 0x000400
/* generates a server (_s.c) file */
#define FLAG_IDL_SERVER 0x000400
/* generates a server (_s.c) file */
...
@@ -1351,6 +1352,7 @@ static struct file *open_local_file( const struct makefile *make, const char *pa
...
@@ -1351,6 +1352,7 @@ static struct file *open_local_file( const struct makefile *make, const char *pa
path
=
strmake
(
"%s/%s"
,
make
->
parent_dir
,
path
);
path
=
strmake
(
"%s/%s"
,
make
->
parent_dir
,
path
);
src_path
=
root_dir_path
(
base_dir_path
(
make
,
path
));
src_path
=
root_dir_path
(
base_dir_path
(
make
,
path
));
ret
=
load_file
(
src_path
);
ret
=
load_file
(
src_path
);
if
(
ret
)
ret
->
flags
|=
FLAG_PARENTDIR
;
}
}
if
(
ret
)
*
filename
=
src_dir_path
(
make
,
path
);
if
(
ret
)
*
filename
=
src_dir_path
(
make
,
path
);
...
@@ -2447,6 +2449,7 @@ static void output_po_files( const struct makefile *make )
...
@@ -2447,6 +2449,7 @@ static void output_po_files( const struct makefile *make )
LIST_FOR_EACH_ENTRY
(
source
,
&
submake
->
sources
,
struct
incl_file
,
entry
)
LIST_FOR_EACH_ENTRY
(
source
,
&
submake
->
sources
,
struct
incl_file
,
entry
)
{
{
if
(
source
->
file
->
flags
&
FLAG_PARENTDIR
)
continue
;
if
(
strendswith
(
source
->
name
,
".rc"
)
&&
(
source
->
file
->
flags
&
FLAG_RC_PO
))
if
(
strendswith
(
source
->
name
,
".rc"
)
&&
(
source
->
file
->
flags
&
FLAG_RC_PO
))
{
{
char
*
pot_file
=
replace_extension
(
source
->
name
,
".rc"
,
".pot"
);
char
*
pot_file
=
replace_extension
(
source
->
name
,
".rc"
,
".pot"
);
...
@@ -2567,7 +2570,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c
...
@@ -2567,7 +2570,7 @@ static void output_source_rc( struct makefile *make, struct incl_file *source, c
output_filename
(
source
->
filename
);
output_filename
(
source
->
filename
);
output
(
"
\n
"
);
output
(
"
\n
"
);
}
}
if
(
source
->
file
->
flags
&
FLAG_RC_PO
)
if
(
source
->
file
->
flags
&
FLAG_RC_PO
&&
!
(
source
->
file
->
flags
&
FLAG_PARENTDIR
)
)
{
{
strarray_add
(
&
make
->
clean_files
,
strmake
(
"%s.pot"
,
obj
));
strarray_add
(
&
make
->
clean_files
,
strmake
(
"%s.pot"
,
obj
));
output
(
"%s.pot: %s
\n
"
,
obj_dir_path
(
make
,
obj
),
source
->
filename
);
output
(
"%s.pot: %s
\n
"
,
obj_dir_path
(
make
,
obj
),
source
->
filename
);
...
...
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