ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

makefiles: Allow including files with relative paths. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2021-09-23 12:42:45 +02:00
parent 15d5cb2256
commit 3c81449d16
3 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/shell32/Makefile.in
View File

@ -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 \

4
dlls/shell32/shell32.rc
View File

@ -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

4
tools/makedep.c
View File

@ -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 );
}