vanja/yabridge
1
0
Fork 0
mirror of https://github.com/robbert-vdh/yabridge.git synced 2026-06-14 23:43:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add proper macro defs for 32-bit Boost Filesystem

Browse Source
This commit is contained in:
Robbert van der Helm
2021-06-24 18:33:00 +02:00
parent b737ba01ad
commit 741b2b7fb5
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meson.build
+29 -18
View File
@@ -153,9 +153,15 @@ boost_dep = dependency('boost', version : '>=1.66', static : with_static_boost)
# use case anyways we'll just brute force it for the time being. # use case anyways we'll just brute force it for the time being.
if get_option('build.cpp_args').contains('-m32') if get_option('build.cpp_args').contains('-m32')
if with_static_boost if with_static_boost
boost_filesystem_dep = declare_dependency(link_args : '-staticboost_filesystem') boost_filesystem_dep = declare_dependency(
link_args : '-staticboost_filesystem',
compile_args : '-DBOOST_FILESYSTEM_STATIC_LINK=1',
)
else else
boost_filesystem_dep = declare_dependency(link_args : '-lboost_filesystem') boost_filesystem_dep = declare_dependency(
link_args : '-lboost_filesystem',
compile_args : '-DBOOST_FILESYSTEM_DYN_LINK=1',
)
endif endif
else else
boost_filesystem_dep = dependency( boost_filesystem_dep = dependency(
@@ -605,22 +611,27 @@ if with_bitbridge
# search path set by the system in `find_library()`. If anyone does know how # search path set by the system in `find_library()`. If anyone does know how
# to properly do this, please let me know! # to properly do this, please let me know!
winegcc = meson.get_compiler('cpp', native : false) winegcc = meson.get_compiler('cpp', native : false)
boost_filesystem_32bit_dep = winegcc.find_library( boost_filesystem_32bit_dep = declare_dependency(
'boost_filesystem', dependencies : winegcc.find_library(
static : with_static_boost, 'boost_filesystem',
dirs : [ static : with_static_boost,
# Used by Arch based distros dirs : [
'/usr/local/lib32', # Used by Arch based distros
'/usr/lib32', '/usr/local/lib32',
# Used by Debian based distros '/usr/lib32',
'/usr/local/lib/i386-linux-gnu', # Used by Debian based distros
'/usr/lib/i386-linux-gnu', '/usr/local/lib/i386-linux-gnu',
# Used by Red Hat based distros, could cause issues though since Meson '/usr/lib/i386-linux-gnu',
# cannot differentiate between the 32-bit version and the regular 64-bit # Used by Red Hat based distros, could cause issues though since Meson
# version that would normally be in /lib # cannot differentiate between the 32-bit version and the regular 64-bit
'/usr/local/lib', # version that would normally be in /lib
'/usr/lib', '/usr/local/lib',
] '/usr/lib',
]
),
compile_args : with_static_boost
? '-DBOOST_FILESYSTEM_STATIC_LINK=1'
: '-DBOOST_FILESYSTEM_DYN_LINK=1',
) )
xcb_32bit_dep = winegcc.find_library('xcb') xcb_32bit_dep = winegcc.find_library('xcb')