Don't link the winelibs with libboost_filesystem

It's not actually used anywhere.
This commit is contained in:
Robbert van der Helm
2020-05-14 19:07:27 +02:00
parent a69ecd22ed
commit e728dbe5a2
3 changed files with 7 additions and 9 deletions
+1
View File
@@ -11,6 +11,7 @@ Versioning](https://semver.org/spec/v2.0.0.html).
### Changed
- Changed architecture to use one less socket.
- Removed dependency on 32-bit Boost.Filesystem.
## [1.1.4] - 2020-05-12
+1 -1
View File
@@ -239,7 +239,7 @@ It is also possible to compile a host application for yabridge that's compatible
with 32-bit plugins such as old SynthEdit plugins. This will allow yabridge to
act as a bitbirdge, allowing you to run old 32-bit only Windows VST2 plugins in
a modern 64-bit Linux VST host. For this you'll need to have installed the 32
bit versions of the Boost and XCB libraries. This can then be set up as follows:
bit version of the XCB library. This can then be set up as follows:
```shell
# Enable the bitbridge on an existing build
+5 -8
View File
@@ -40,8 +40,10 @@ endif
subdir('src/common/config')
# Statically link against Boost.Filesystem, otherwise it becomes impossible to
# distribute a prebuilt version of yabridge
boost_dep = dependency('boost', version : '>=1.66', modules : ['filesystem'], static : true)
# distribute a prebuilt version of yabridge. For the Wine host applications we
# only use the headers only libraries.
boost_dep = dependency('boost', version : '>=1.66', static : true)
boost_filesystem_dep = dependency('boost', version : '>=1.66', modules : ['filesystem'], static : true)
bitsery_dep = subproject('bitsery').get_variable('bitsery_dep')
threads_dep = dependency('threads')
# The built in threads dependency does not know how to handle winegcc
@@ -67,7 +69,7 @@ shared_library(
],
native : true,
include_directories : include_dir,
dependencies : [boost_dep, bitsery_dep, threads_dep],
dependencies : [boost_dep, boost_filesystem_dep, bitsery_dep, threads_dep],
cpp_args : compiler_options,
link_args : ['-ldl']
)
@@ -99,11 +101,6 @@ if get_option('use-bitbridge')
# I honestly have no idea what the correct way to have `find_dependency()` use
# `/usr/lib32` instead of `/usr/lib` is. If anyone does know, please tell me!
winegcc = meson.get_compiler('cpp', native : false)
boost_dep = winegcc.find_library(
'boost_filesystem',
static : true,
dirs : ['/usr/lib', '/usr/local/lib']
)
xcb_dep = winegcc.find_library('xcb')
executable(