Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
aa15f41d
Commit
aa15f41d
authored
Sep 05, 2023
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
makedep: Make the spec file optional for native modules.
parent
f1ff3179
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
30 additions
and
34 deletions
+30
-34
Makefile.in
dlls/fltmgr.sys/Makefile.in
+2
-1
http.sys.spec
dlls/http.sys/http.sys.spec
+0
-1
Makefile.in
dlls/ksecdd.sys/Makefile.in
+4
-4
mountmgr.sys.spec
dlls/mountmgr.sys/mountmgr.sys.spec
+0
-1
Makefile.in
dlls/ndis.sys/Makefile.in
+3
-2
Makefile.in
dlls/netio.sys/Makefile.in
+3
-2
nsiproxy.sys.spec
dlls/nsiproxy.sys/nsiproxy.sys.spec
+0
-1
Makefile.in
dlls/scsiport.sys/Makefile.in
+3
-2
Makefile.in
dlls/tdi.sys/Makefile.in
+3
-2
Makefile.in
dlls/usbd.sys/Makefile.in
+3
-2
winebus.sys.spec
dlls/winebus.sys/winebus.sys.spec
+0
-1
winehid.sys.spec
dlls/winehid.sys/winehid.sys.spec
+0
-1
wineusb.sys.spec
dlls/wineusb.sys/wineusb.sys.spec
+0
-1
winexinput.sys.spec
dlls/winexinput.sys/winexinput.sys.spec
+0
-1
make_makefiles
tools/make_makefiles
+3
-1
makedep.c
tools/makedep.c
+6
-11
No files found.
dlls/fltmgr.sys/Makefile.in
View file @
aa15f41d
MODULE
=
fltmgr.sys
MODULE
=
fltmgr.sys
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
fltmgr.sys.spec
\
main.c
main.c
dlls/http.sys/http.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
dlls/ksecdd.sys/Makefile.in
View file @
aa15f41d
...
@@ -2,7 +2,7 @@ MODULE = ksecdd.sys
...
@@ -2,7 +2,7 @@ MODULE = ksecdd.sys
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRC
S
=
\
SOURCE
S
=
\
main.c
ksecdd.sys.spec
\
main.c
\
RC_SRCS
=
version.rc
version.rc
dlls/mountmgr.sys/mountmgr.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
dlls/ndis.sys/Makefile.in
View file @
aa15f41d
...
@@ -3,5 +3,6 @@ IMPORTS = advapi32 ntoskrnl iphlpapi
...
@@ -3,5 +3,6 @@ IMPORTS = advapi32 ntoskrnl iphlpapi
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
main.c
main.c
\
ndis.sys.spec
dlls/netio.sys/Makefile.in
View file @
aa15f41d
...
@@ -4,5 +4,6 @@ IMPORTS = ntoskrnl ws2_32
...
@@ -4,5 +4,6 @@ IMPORTS = ntoskrnl ws2_32
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
netio.c
netio.c
\
netio.sys.spec
dlls/nsiproxy.sys/nsiproxy.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# no exported functions
dlls/scsiport.sys/Makefile.in
View file @
aa15f41d
...
@@ -3,5 +3,6 @@ IMPORTS = ntoskrnl
...
@@ -3,5 +3,6 @@ IMPORTS = ntoskrnl
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
scsiport.c
scsiport.c
\
scsiport.sys.spec
dlls/tdi.sys/Makefile.in
View file @
aa15f41d
...
@@ -2,5 +2,6 @@ MODULE = tdi.sys
...
@@ -2,5 +2,6 @@ MODULE = tdi.sys
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
main.c
main.c
\
tdi.sys.spec
dlls/usbd.sys/Makefile.in
View file @
aa15f41d
...
@@ -4,5 +4,6 @@ IMPORTS = ntoskrnl
...
@@ -4,5 +4,6 @@ IMPORTS = ntoskrnl
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
EXTRADLLFLAGS
=
-Wl
,--subsystem,native
C_SRCS
=
\
SOURCES
=
\
usbd.c
usbd.c
\
usbd.sys.spec
dlls/winebus.sys/winebus.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
dlls/winehid.sys/winehid.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
dlls/wineusb.sys/wineusb.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
dlls/winexinput.sys/winexinput.sys.spec
deleted
100644 → 0
View file @
f1ff3179
# nothing to export
tools/make_makefiles
View file @
aa15f41d
...
@@ -382,7 +382,9 @@ sub assign_sources_to_makefiles(@)
...
@@ -382,7 +382,9 @@ sub assign_sources_to_makefiles(@)
elsif
(
$name
=~
/\.spec$/
)
elsif
(
$name
=~
/\.spec$/
)
{
{
my
$dllflags
=
$
{
$make
}{
"EXTRADLLFLAGS"
}
||
""
;
my
$dllflags
=
$
{
$make
}{
"EXTRADLLFLAGS"
}
||
""
;
next
unless
defined
$
{
$make
}{
"TESTDLL"
}
||
(
$dllflags
=~
/-Wb,--data-only/
);
next
unless
defined
$
{
$make
}{
"TESTDLL"
}
||
(
$dllflags
=~
/-Wb,--data-only/
)
||
(
$dllflags
=~
/-Wl,--subsystem,native/
);
}
}
elsif
(
$name
=~
/\.nls$/
)
elsif
(
$name
=~
/\.nls$/
)
{
{
...
...
tools/makedep.c
View file @
aa15f41d
...
@@ -3304,15 +3304,13 @@ static const struct
...
@@ -3304,15 +3304,13 @@ static const struct
/*******************************************************************
/*******************************************************************
* output_fake_module
* output_fake_module
*/
*/
static
void
output_fake_module
(
struct
makefile
*
make
)
static
void
output_fake_module
(
struct
makefile
*
make
,
const
char
*
spec_file
)
{
{
unsigned
int
arch
=
0
;
/* fake modules are always native */
unsigned
int
arch
=
0
;
/* fake modules are always native */
const
char
*
spec_file
=
NULL
,
*
name
=
strmake
(
"%s%s"
,
arch_pe_dirs
[
arch
],
make
->
module
);
const
char
*
name
=
strmake
(
"%s%s"
,
arch_pe_dirs
[
arch
],
make
->
module
);
if
(
make
->
disabled
[
arch
])
return
;
if
(
make
->
disabled
[
arch
])
return
;
if
(
!
make
->
is_exe
)
spec_file
=
src_dir_path
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
strarray_add
(
&
make
->
all_targets
[
arch
],
name
);
strarray_add
(
&
make
->
all_targets
[
arch
],
name
);
add_install_rule
(
make
,
make
->
module
,
arch
,
name
,
strmake
(
"d$(dlldir)/%s"
,
name
));
add_install_rule
(
make
,
make
->
module
,
arch
,
name
,
strmake
(
"d$(dlldir)/%s"
,
name
));
...
@@ -3324,11 +3322,8 @@ static void output_fake_module( struct makefile *make )
...
@@ -3324,11 +3322,8 @@ static void output_fake_module( struct makefile *make )
output
(
"
\n
"
);
output
(
"
\n
"
);
output_winegcc_command
(
make
,
arch
);
output_winegcc_command
(
make
,
arch
);
output_filename
(
"-Wb,--fake-module"
);
output_filename
(
"-Wb,--fake-module"
);
if
(
spec_file
)
if
(
!
make
->
is_exe
)
output_filename
(
"-shared"
);
{
if
(
spec_file
)
output_filename
(
spec_file
);
output_filename
(
"-shared"
);
output_filename
(
spec_file
);
}
output_filenames
(
make
->
extradllflags
);
output_filenames
(
make
->
extradllflags
);
output_filenames_obj_dir
(
make
,
make
->
res_files
[
arch
]
);
output_filenames_obj_dir
(
make
,
make
->
res_files
[
arch
]
);
output
(
"
\n
"
);
output
(
"
\n
"
);
...
@@ -3353,7 +3348,7 @@ static void output_module( struct makefile *make, unsigned int arch )
...
@@ -3353,7 +3348,7 @@ static void output_module( struct makefile *make, unsigned int arch )
if
(
!
make
->
is_exe
)
if
(
!
make
->
is_exe
)
{
{
if
(
make
->
data_only
)
if
(
make
->
data_only
||
strarray_exists
(
&
make
->
extradllflags
,
"-Wl,--subsystem,native"
)
)
{
{
/* spec file is optional */
/* spec file is optional */
struct
incl_file
*
spec
=
find_src_file
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
struct
incl_file
*
spec
=
find_src_file
(
make
,
replace_extension
(
make
->
module
,
".dll"
,
".spec"
));
...
@@ -3415,7 +3410,7 @@ static void output_module( struct makefile *make, unsigned int arch )
...
@@ -3415,7 +3410,7 @@ static void output_module( struct makefile *make, unsigned int arch )
output_filename
(
arch_make_variable
(
"LDFLAGS"
,
arch
));
output_filename
(
arch_make_variable
(
"LDFLAGS"
,
arch
));
output
(
"
\n
"
);
output
(
"
\n
"
);
if
(
!
make
->
data_only
&&
!
arch
&&
unix_lib_supported
)
output_fake_module
(
make
);
if
(
!
make
->
data_only
&&
!
arch
&&
unix_lib_supported
)
output_fake_module
(
make
,
spec_file
);
}
}
...
...
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