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
64de93e3
Commit
64de93e3
authored
Oct 12, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makefiles: Always use the global SOURCES variable for .mc files.
parent
1255764a
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
17 additions
and
21 deletions
+17
-21
Makefile.in
dlls/kernelbase/Makefile.in
+4
-5
Makefile.in
dlls/mferror/Makefile.in
+1
-1
Makefile.in
dlls/wininet/Makefile.in
+3
-6
Makefile.in
programs/fsutil/Makefile.in
+2
-4
make_makefiles
tools/make_makefiles
+7
-5
No files found.
dlls/kernelbase/Makefile.in
View file @
64de93e3
...
@@ -7,10 +7,11 @@ EXTRADLLFLAGS = -nodefaultlibs -nostartfiles
...
@@ -7,10 +7,11 @@ EXTRADLLFLAGS = -nodefaultlibs -nostartfiles
i386_EXTRADLLFLAGS
=
-Wl
,--image-base,0x7b000000
i386_EXTRADLLFLAGS
=
-Wl
,--image-base,0x7b000000
x86_64_EXTRADLLFLAGS
=
-Wl
,--image-base,0x174000000
x86_64_EXTRADLLFLAGS
=
-Wl
,--image-base,0x174000000
C_SRC
S
=
\
SOURCE
S
=
\
console.c
\
console.c
\
debug.c
\
debug.c
\
file.c
\
file.c
\
kernelbase.rc
\
loader.c
\
loader.c
\
locale.c
\
locale.c
\
main.c
\
main.c
\
...
@@ -23,7 +24,5 @@ C_SRCS = \
...
@@ -23,7 +24,5 @@ C_SRCS = \
sync.c
\
sync.c
\
thread.c
\
thread.c
\
version.c
\
version.c
\
volume.c
volume.c
\
winerror.mc
RC_SRCS
=
kernelbase.rc
MC_SRCS
=
winerror.mc
dlls/mferror/Makefile.in
View file @
64de93e3
...
@@ -2,4 +2,4 @@ MODULE = mferror.dll
...
@@ -2,4 +2,4 @@ MODULE = mferror.dll
EXTRADLLFLAGS
=
-Wb
,--data-only
EXTRADLLFLAGS
=
-Wb
,--data-only
MC_SRC
S
=
mferror.mc
SOURCE
S
=
mferror.mc
dlls/wininet/Makefile.in
View file @
64de93e3
...
@@ -5,7 +5,7 @@ IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32
...
@@ -5,7 +5,7 @@ IMPORTS = $(ZLIB_PE_LIBS) mpr shlwapi shell32 user32 ws2_32 advapi32
EXTRAINCL
=
$(ZLIB_PE_CFLAGS)
EXTRAINCL
=
$(ZLIB_PE_CFLAGS)
DELAYIMPORTS
=
secur32 crypt32 cryptui dhcpcsvc iphlpapi
DELAYIMPORTS
=
secur32 crypt32 cryptui dhcpcsvc iphlpapi
C_SRC
S
=
\
SOURCE
S
=
\
cookie.c
\
cookie.c
\
dialogs.c
\
dialogs.c
\
ftp.c
\
ftp.c
\
...
@@ -14,9 +14,6 @@ C_SRCS = \
...
@@ -14,9 +14,6 @@ C_SRCS = \
internet.c
\
internet.c
\
netconnection.c
\
netconnection.c
\
urlcache.c
\
urlcache.c
\
utility.c
utility.c
\
wininet.rc
\
RC_SRCS
=
wininet.rc
MC_SRCS
=
\
winineterror.mc
winineterror.mc
programs/fsutil/Makefile.in
View file @
64de93e3
...
@@ -3,8 +3,6 @@ IMPORTS = user32
...
@@ -3,8 +3,6 @@ IMPORTS = user32
EXTRADLLFLAGS
=
-mconsole
-municode
EXTRADLLFLAGS
=
-mconsole
-municode
C_SRCS
=
\
SOURCES
=
\
fsutil.mc
\
main.c
main.c
MC_SRCS
=
\
fsutil.mc
tools/make_makefiles
View file @
64de93e3
...
@@ -338,7 +338,12 @@ sub assign_sources_to_makefiles(@)
...
@@ -338,7 +338,12 @@ sub assign_sources_to_makefiles(@)
my
$make
=
$makefiles
{
"$dir/Makefile.in"
};
my
$make
=
$makefiles
{
"$dir/Makefile.in"
};
my
$name
=
substr
(
$file
,
length
(
$dir
)
+
1
);
my
$name
=
substr
(
$file
,
length
(
$dir
)
+
1
);
if
(
$name
=~
/\.m$/
)
{
push
@
{
$
{
$make
}{
"=OBJC_SRCS"
}},
$name
;
}
if
(
$name
=~
/\.mc$/
)
{
push
@
{
$
{
$make
}{
"=SOURCES"
}},
$name
;
next
;
}
elsif
(
$name
=~
/\.m$/
)
{
push
@
{
$
{
$make
}{
"=OBJC_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.l$/
)
{
push
@
{
$
{
$make
}{
"=LEX_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.l$/
)
{
push
@
{
$
{
$make
}{
"=LEX_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.y$/
)
{
push
@
{
$
{
$make
}{
"=BISON_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.y$/
)
{
push
@
{
$
{
$make
}{
"=BISON_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.svg$/
)
{
push
@
{
$
{
$make
}{
"=SVG_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.svg$/
)
{
push
@
{
$
{
$make
}{
"=SVG_SRCS"
}},
$name
;
}
...
@@ -358,10 +363,6 @@ sub assign_sources_to_makefiles(@)
...
@@ -358,10 +363,6 @@ sub assign_sources_to_makefiles(@)
{
{
push
@
{
$
{
$make
}{
"=RC_SRCS"
}},
$name
;
push
@
{
$
{
$make
}{
"=RC_SRCS"
}},
$name
;
}
}
elsif
(
$name
=~
/\.mc$/
)
{
push
@
{
$
{
$make
}{
"=MC_SRCS"
}},
$name
;
}
elsif
(
$name
=~
/\.po$/
)
elsif
(
$name
=~
/\.po$/
)
{
{
push
@
{
$
{
$make
}{
"=PO_SRCS"
}},
$name
;
push
@
{
$
{
$make
}{
"=PO_SRCS"
}},
$name
;
...
@@ -408,6 +409,7 @@ sub assign_sources_to_makefiles(@)
...
@@ -408,6 +409,7 @@ sub assign_sources_to_makefiles(@)
my
$make
=
$makefiles
{
$file
};
my
$make
=
$makefiles
{
$file
};
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
},
"SOURCES"
);
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
},
"RC_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"IDL_SRCS"
);
preserve_shared_source_files
(
$makefiles
{
$file
},
$makefiles
{
$parent
},
"IDL_SRCS"
);
...
...
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