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
7d60d0d7
Commit
7d60d0d7
authored
Aug 12, 2021
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
winegcc: Use custom subsystem 'unixlib' instead of 'native' for Unix libraries.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ada8bf03
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
Makefile.in
dlls/winepulse.drv/Makefile.in
+1
-1
winegcc.c
tools/winegcc/winegcc.c
+4
-4
No files found.
dlls/winepulse.drv/Makefile.in
View file @
7d60d0d7
MODULE
=
winepulse.drv
IMPORTS
=
dxguid uuid winmm user32 advapi32 ole32
EXTRALIBS
=
$(PULSE_LIBS)
$(PTHREAD_LIBS)
-Wl
,--subsystem,
native
EXTRALIBS
=
$(PULSE_LIBS)
$(PTHREAD_LIBS)
-Wl
,--subsystem,
unixlib
EXTRAINCL
=
$(PULSE_CFLAGS)
EXTRADLLFLAGS
=
-mno-cygwin
...
...
tools/winegcc/winegcc.c
View file @
7d60d0d7
...
...
@@ -523,7 +523,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
if
(
opts
->
unicode_app
)
strarray_add
(
flags
,
"-municode"
);
if
(
opts
->
nodefaultlibs
||
opts
->
use_msvcrt
)
strarray_add
(
flags
,
"-nodefaultlibs"
);
if
(
opts
->
nostartfiles
||
opts
->
use_msvcrt
)
strarray_add
(
flags
,
"-nostartfiles"
);
if
(
opts
->
subsystem
)
strarray_add
(
flags
,
strmake
(
"-Wl,--subsystem,%s"
,
opts
->
subsystem
));
if
(
opts
->
subsystem
&&
strcmp
(
opts
->
subsystem
,
"unixlib"
)
)
strarray_add
(
flags
,
strmake
(
"-Wl,--subsystem,%s"
,
opts
->
subsystem
));
strarray_add
(
flags
,
"-Wl,--nxcompat"
);
...
...
@@ -563,7 +563,7 @@ static strarray *get_link_args( struct options *opts, const char *output_name )
if
(
opts
->
nodefaultlibs
||
opts
->
use_msvcrt
)
strarray_add
(
flags
,
"-nodefaultlibs"
);
if
(
opts
->
nostartfiles
||
opts
->
use_msvcrt
)
strarray_add
(
flags
,
"-nostartfiles"
);
if
(
opts
->
image_base
)
strarray_add
(
flags
,
strmake
(
"-Wl,-base:%s"
,
opts
->
image_base
));
if
(
opts
->
subsystem
)
if
(
opts
->
subsystem
&&
strcmp
(
opts
->
subsystem
,
"unixlib"
)
)
strarray_add
(
flags
,
strmake
(
"-Wl,-subsystem:%s"
,
opts
->
subsystem
));
else
strarray_add
(
flags
,
strmake
(
"-Wl,-subsystem:%s"
,
opts
->
gui_app
?
"windows"
:
"console"
));
...
...
@@ -1091,7 +1091,7 @@ static void add_library( struct options *opts, strarray *lib_dirs, strarray *fil
strarray_add
(
files
,
strmake
(
"-a%s"
,
fullname
));
break
;
case
file_dll
:
if
(
opts
->
unix_lib
&&
opts
->
subsystem
&&
!
strcmp
(
opts
->
subsystem
,
"
native
"
))
if
(
opts
->
unix_lib
&&
opts
->
subsystem
&&
!
strcmp
(
opts
->
subsystem
,
"
unixlib
"
))
{
if
(
get_lib_type
(
opts
->
target_platform
,
lib_dirs
,
library
,
""
,
".so"
,
&
unixlib
)
==
file_so
)
{
...
...
@@ -1177,7 +1177,7 @@ static const char *build_spec_obj( struct options *opts, const char *spec_file,
strarray_add
(
spec_args
,
entry_point
);
}
if
(
opts
->
subsystem
)
if
(
opts
->
subsystem
&&
strcmp
(
opts
->
subsystem
,
"unixlib"
)
)
{
strarray_add
(
spec_args
,
"--subsystem"
);
strarray_add
(
spec_args
,
opts
->
subsystem
);
...
...
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