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
f1ff3179
Commit
f1ff3179
authored
Sep 05, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makedep: Make the spec file optional for data-only dlls.
parent
cfcf5ca2
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
31 additions
and
17 deletions
+31
-17
activeds.tlb.spec
dlls/activeds.tlb/activeds.tlb.spec
+0
-1
Makefile.in
dlls/apisetschema/Makefile.in
+2
-0
Makefile.in
dlls/icmp/Makefile.in
+2
-0
light.msstyles.spec
dlls/light.msstyles/light.msstyles.spec
+0
-1
Makefile.in
dlls/lz32/Makefile.in
+3
-1
mferror.spec
dlls/mferror/mferror.spec
+0
-1
mshtml.tlb.spec
dlls/mshtml.tlb/mshtml.tlb.spec
+0
-1
msimsg.spec
dlls/msimsg/msimsg.spec
+0
-1
Makefile.in
dlls/normaliz/Makefile.in
+2
-0
Makefile.in
dlls/security/Makefile.in
+2
-0
Makefile.in
dlls/sfc/Makefile.in
+2
-0
shdoclc.spec
dlls/shdoclc/shdoclc.spec
+0
-1
stdole2.tlb.spec
dlls/stdole2.tlb/stdole2.tlb.spec
+0
-1
stdole32.tlb.spec
dlls/stdole32.tlb/stdole32.tlb.spec
+0
-1
tzres.spec
dlls/tzres/tzres.spec
+0
-1
Makefile.in
dlls/usp10/Makefile.in
+2
-0
Makefile.in
dlls/wmi/Makefile.in
+2
-0
make_makefiles
tools/make_makefiles
+2
-1
makedep.c
tools/makedep.c
+12
-6
No files found.
dlls/activeds.tlb/activeds.tlb.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported entry points
dlls/apisetschema/Makefile.in
View file @
f1ff3179
MODULE
=
apisetschema.dll
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
apisetschema.spec
dlls/icmp/Makefile.in
View file @
f1ff3179
MODULE
=
icmp.dll
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
icmp.spec
dlls/light.msstyles/light.msstyles.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported entry points
dlls/lz32/Makefile.in
View file @
f1ff3179
...
...
@@ -3,4 +3,6 @@ IMPORTLIB = lz32
EXTRADLLFLAGS
=
-Wb
,--data-only
RC_SRCS
=
version.rc
SOURCES
=
\
lz32.spec
\
version.rc
dlls/mferror/mferror.spec
deleted
100644 → 0
View file @
cfcf5ca2
# This is resource dll
dlls/mshtml.tlb/mshtml.tlb.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported entry points
dlls/msimsg/msimsg.spec
deleted
100644 → 0
View file @
cfcf5ca2
# empty
dlls/normaliz/Makefile.in
View file @
f1ff3179
...
...
@@ -2,3 +2,5 @@ MODULE = normaliz.dll
IMPORTLIB
=
normaliz
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
normaliz.spec
dlls/security/Makefile.in
View file @
f1ff3179
...
...
@@ -2,3 +2,5 @@ MODULE = security.dll
IMPORTS
=
secur32
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
security.spec
dlls/sfc/Makefile.in
View file @
f1ff3179
...
...
@@ -2,3 +2,5 @@ MODULE = sfc.dll
IMPORTLIB
=
sfc
EXTRADLLFLAGS
=
-Wb
,--data-only
-Wb
,--prefer-native
SOURCES
=
sfc.spec
dlls/shdoclc/shdoclc.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported functions
dlls/stdole2.tlb/stdole2.tlb.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported entry points
dlls/stdole32.tlb/stdole32.tlb.spec
deleted
100644 → 0
View file @
cfcf5ca2
# no exported entry points
dlls/tzres/tzres.spec
deleted
100644 → 0
View file @
cfcf5ca2
# nothing exported
dlls/usp10/Makefile.in
View file @
f1ff3179
...
...
@@ -2,3 +2,5 @@ MODULE = usp10.dll
IMPORTLIB
=
usp10
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
usp10.spec
dlls/wmi/Makefile.in
View file @
f1ff3179
...
...
@@ -2,3 +2,5 @@ MODULE = wmi.dll
IMPORTS
=
advapi32
EXTRADLLFLAGS
=
-Wb
,--data-only
SOURCES
=
wmi.spec
tools/make_makefiles
View file @
f1ff3179
...
...
@@ -381,7 +381,8 @@ sub assign_sources_to_makefiles(@)
}
elsif
(
$name
=~
/\.spec$/
)
{
next
unless
defined
$
{
$make
}{
"TESTDLL"
};
my
$dllflags
=
$
{
$make
}{
"EXTRADLLFLAGS"
}
||
""
;
next
unless
defined
$
{
$make
}{
"TESTDLL"
}
||
(
$dllflags
=~
/-Wb,--data-only/
);
}
elsif
(
$name
=~
/\.nls$/
)
{
...
...
tools/makedep.c
View file @
f1ff3179
...
...
@@ -3351,7 +3351,16 @@ static void output_module( struct makefile *make, unsigned int arch )
if
(
make
->
disabled
[
arch
])
return
;
if
(
!
make
->
is_exe
)
spec_file
=
src_dir_path
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
if
(
!
make
->
is_exe
)
{
if
(
make
->
data_only
)
{
/* spec file is optional */
struct
incl_file
*
spec
=
find_src_file
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
if
(
spec
)
spec_file
=
spec
->
filename
;
}
else
spec_file
=
src_dir_path
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
}
if
(
!
make
->
data_only
)
{
...
...
@@ -3394,11 +3403,8 @@ static void output_module( struct makefile *make, unsigned int arch )
output
(
"
\n
"
);
output_winegcc_command
(
make
,
arch
);
if
(
arch
)
output_filename
(
"-Wl,--wine-builtin"
);
if
(
spec_file
)
{
output_filename
(
"-shared"
);
output_filename
(
spec_file
);
}
if
(
!
make
->
is_exe
)
output_filename
(
"-shared"
);
if
(
spec_file
)
output_filename
(
spec_file
);
output_filenames
(
make
->
extradllflags
);
if
(
arch
)
output_filenames
(
get_expanded_arch_var_array
(
make
,
"EXTRADLLFLAGS"
,
arch
));
output_filenames_obj_dir
(
make
,
make
->
object_files
[
arch
]
);
...
...
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