vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-05-07 03:50:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of all traces of pthreads in Wine

Browse Source 
Since this can only cause issues.
This commit is contained in:
Robbert van der Helm
2020-12-10 15:44:08 +01:00
parent 5c98b74bc2
commit e9af76d21e
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+4 -6
View File
@@ -65,8 +65,6 @@ bitsery_dep = subproject('bitsery', version : '5.2.0').get_variable('bitsery_dep
function2_dep = subproject('function2', version : '4.1.0').get_variable('function2_dep')
threads_dep = dependency('threads')
tomlplusplus_dep = subproject('tomlplusplus', version : '2.1.0').get_variable('tomlplusplus_dep')
# The built in threads dependency does not know how to handle winegcc
wine_threads_dep = declare_dependency(link_args : '-lpthread')
xcb_dep = dependency('xcb')
include_dir = include_directories('src/include')
@@ -122,6 +120,10 @@ group_host_sources = host_sources + [
'src/wine-host/group-host.cpp',
]
# Get rid of all traces of pthreads in Boost.Asio since this will not play
# nicely with Wine's own thread system
compiler_options += ['-DBOOST_ASIO_DISABLE_THREADS', '-DBOOST_ASIO_DISABLE_STD_THREAD']
executable(
individual_host_name_64bit,
individual_host_sources,
@@ -133,7 +135,6 @@ executable(
bitsery_dep,
function2_dep,
tomlplusplus_dep,
wine_threads_dep,
xcb_dep
],
cpp_args : compiler_options + ['-m64'],
@@ -151,7 +152,6 @@ executable(
bitsery_dep,
function2_dep,
tomlplusplus_dep,
wine_threads_dep,
xcb_dep
],
cpp_args : compiler_options + ['-m64'],
@@ -197,7 +197,6 @@ if with_bitbridge
bitsery_dep,
function2_dep,
tomlplusplus_dep,
wine_threads_dep,
xcb_dep
],
cpp_args : compiler_options + ['-m32'],
@@ -215,7 +214,6 @@ if with_bitbridge
bitsery_dep,
function2_dep,
tomlplusplus_dep,
wine_threads_dep,
xcb_dep
],
cpp_args : compiler_options + ['-m32'],