Revert "Don't link the winelibs with libboost_filesystem"

This reverts commit e728dbe5a2.

`std::filesystem` is broken on wineg++, at least with Wine 5.8. Any path
operations will throw a `std::filesystem::__cxx11::filesystem_error`:

  what():  filesystem error: Cannot convert character sequence: Invalid or incomplete multibyte or wide character
This commit is contained in:
Robbert van der Helm
2020-05-17 16:36:09 +02:00
parent 2f39650322
commit 4e80e23cc0
3 changed files with 12 additions and 5 deletions
-1
View File
@@ -11,7 +11,6 @@ Versioning](https://semver.org/spec/v2.0.0.html).
### Changed ### Changed
- Changed architecture to use one less socket. - Changed architecture to use one less socket.
- Removed dependency on 32-bit Boost.Filesystem.
### Fixed ### Fixed
+1 -1
View File
@@ -244,7 +244,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 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 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 a modern 64-bit Linux VST host. For this you'll need to have installed the 32
bit version of the XCB library. This can then be set up as follows: bit versions of the Boost and XCB libraries. This can then be set up as follows:
```shell ```shell
# Enable the bitbridge on an existing build # Enable the bitbridge on an existing build
+11 -3
View File
@@ -41,9 +41,8 @@ endif
# and the name of the host binary # and the name of the host binary
subdir('src/common/config') subdir('src/common/config')
# Statically link against Boost.Filesystem, otherwise it becomes impossible to # Statically link against Boost.Filesystem, otherwise it would become impossible
# distribute a prebuilt version of yabridge. For the Wine host applications we # to distribute a prebuilt version of yabridge
# only use the headers only libraries.
boost_dep = dependency('boost', version : '>=1.66', static : true) boost_dep = dependency('boost', version : '>=1.66', static : true)
boost_filesystem_dep = dependency('boost', version : '>=1.66', modules : ['filesystem'], static : true) boost_filesystem_dep = dependency('boost', version : '>=1.66', modules : ['filesystem'], static : true)
bitsery_dep = subproject('bitsery').get_variable('bitsery_dep') bitsery_dep = subproject('bitsery').get_variable('bitsery_dep')
@@ -104,6 +103,7 @@ executable(
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
boost_dep, boost_dep,
boost_filesystem_dep,
bitsery_dep, bitsery_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
@@ -120,6 +120,7 @@ executable(
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
boost_dep, boost_dep,
boost_filesystem_dep,
bitsery_dep, bitsery_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
@@ -135,6 +136,11 @@ if get_option('use-bitbridge')
# I honestly have no idea what the correct way to have `find_dependency()` use # 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! # `/usr/lib32` instead of `/usr/lib` is. If anyone does know, please tell me!
winegcc = meson.get_compiler('cpp', native : false) winegcc = meson.get_compiler('cpp', native : false)
boost_filesystem_dep = winegcc.find_library(
'boost_filesystem',
static : true,
dirs : ['/usr/lib', '/usr/local/lib']
)
xcb_dep = winegcc.find_library('xcb') xcb_dep = winegcc.find_library('xcb')
executable( executable(
@@ -144,6 +150,7 @@ if get_option('use-bitbridge')
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
boost_dep, boost_dep,
boost_filesystem_dep,
bitsery_dep, bitsery_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,
@@ -167,6 +174,7 @@ if get_option('use-bitbridge')
include_directories : include_dir, include_directories : include_dir,
dependencies : [ dependencies : [
boost_dep, boost_dep,
boost_filesystem_dep,
bitsery_dep, bitsery_dep,
tomlplusplus_dep, tomlplusplus_dep,
wine_threads_dep, wine_threads_dep,