zontreck/wine
1
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine.git synced 2024-11-21 17:09:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

makedep: Make the spec file optional for data-only dlls.

Browse source
This commit is contained in:
Alexandre Julliard 2023-09-05 13:07:18 +02:00
parent cfcf5ca286
commit f1ff3179aa
19 changed files with 31 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/activeds.tlb/activeds.tlb.spec
View file

@ -1 +0,0 @@
# no exported entry points

2
dlls/apisetschema/Makefile.in
View file

@ -1,3 +1,5 @@
MODULE = apisetschema.dll
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = apisetschema.spec

2
dlls/icmp/Makefile.in
View file

@ -1,3 +1,5 @@
MODULE = icmp.dll
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = icmp.spec

1
dlls/light.msstyles/light.msstyles.spec
View file

@ -1 +0,0 @@
# no exported entry points

4
dlls/lz32/Makefile.in
View file

@ -3,4 +3,6 @@ IMPORTLIB = lz32
EXTRADLLFLAGS = -Wb,--data-only
RC_SRCS = version.rc
SOURCES = \
lz32.spec \
version.rc

1
dlls/mferror/mferror.spec
View file

@ -1 +0,0 @@
# This is resource dll

1
dlls/mshtml.tlb/mshtml.tlb.spec
View file

@ -1 +0,0 @@
# no exported entry points

1
dlls/msimsg/msimsg.spec
View file

@ -1 +0,0 @@
# empty

2
dlls/normaliz/Makefile.in
View file

@ -2,3 +2,5 @@ MODULE = normaliz.dll
IMPORTLIB = normaliz
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = normaliz.spec

2
dlls/security/Makefile.in
View file

@ -2,3 +2,5 @@ MODULE = security.dll
IMPORTS = secur32
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = security.spec

2
dlls/sfc/Makefile.in
View file

@ -2,3 +2,5 @@ MODULE = sfc.dll
IMPORTLIB = sfc
EXTRADLLFLAGS = -Wb,--data-only -Wb,--prefer-native
SOURCES = sfc.spec

1
dlls/shdoclc/shdoclc.spec
View file

@ -1 +0,0 @@
# no exported functions

1
dlls/stdole2.tlb/stdole2.tlb.spec
View file

@ -1 +0,0 @@
# no exported entry points

1
dlls/stdole32.tlb/stdole32.tlb.spec
View file

@ -1 +0,0 @@
# no exported entry points

1
dlls/tzres/tzres.spec
View file

@ -1 +0,0 @@
# nothing exported

2
dlls/usp10/Makefile.in
View file

@ -2,3 +2,5 @@ MODULE = usp10.dll
IMPORTLIB = usp10
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = usp10.spec

2
dlls/wmi/Makefile.in
View file

@ -2,3 +2,5 @@ MODULE = wmi.dll
IMPORTS = advapi32
EXTRADLLFLAGS = -Wb,--data-only
SOURCES = wmi.spec

3
tools/make_makefiles
View file

@ -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$/)
{

18
tools/makedep.c
View file

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