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
3c81449d
Commit
3c81449d
authored
Sep 23, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Allow including files with relative paths.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
15d5cb22
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
7 deletions
+3
-7
Makefile.in
dlls/shell32/Makefile.in
+0
-2
shell32.rc
dlls/shell32/shell32.rc
+2
-2
makedep.c
tools/makedep.c
+1
-3
No files found.
dlls/shell32/Makefile.in
View file @
3c81449d
...
...
@@ -3,8 +3,6 @@ MODULE = shell32.dll
IMPORTLIB
=
shell32
IMPORTS
=
uuid shlwapi user32 gdi32 advapi32
DELAYIMPORTS
=
ole32 oleaut32 shdocvw version comctl32 gdiplus
# AUTHORS file is in the top-level directory
EXTRAINCL
=
-I
$(top_srcdir)
C_SRCS
=
\
appbar.c
\
...
...
dlls/shell32/shell32.rc
View file @
3c81449d
...
...
@@ -1101,8 +1101,8 @@ IDR_AVI_FILENUKE AVI resources/searching.avi
/* @makedep: resources/searching.avi */
IDR_AVI_FILEDELETE AVI resources/searching.avi
/* @makedep: AUTHORS */
AUTHORS RCDATA AUTHORS
/* @makedep:
../../
AUTHORS */
AUTHORS RCDATA
../../
AUTHORS
/* @makedep: shell32.manifest */
124 RT_MANIFEST shell32.manifest
...
...
tools/makedep.c
View file @
3c81449d
...
...
@@ -909,9 +909,6 @@ static void add_dependency( struct file *file, const char *name, enum incl_type
{
/* enforce some rules for the Wine tree */
if
(
!
memcmp
(
name
,
"../"
,
3
))
fatal_error
(
"#include directive with relative path not allowed
\n
"
);
if
(
!
strcmp
(
name
,
"config.h"
))
{
if
(
strendswith
(
file
->
name
,
".h"
))
...
...
@@ -1456,6 +1453,7 @@ static struct file *open_global_file( const struct makefile *make, const char *p
*/
static
struct
file
*
open_global_header
(
const
struct
makefile
*
make
,
const
char
*
path
,
char
**
filename
)
{
if
(
!
strncmp
(
path
,
"../"
,
3
))
return
NULL
;
return
open_global_file
(
make
,
strmake
(
"include/%s"
,
path
),
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