From e728dbe5a2262d9df931c93c651b053d7a80b5e5 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Thu, 14 May 2020 19:07:27 +0200
Subject: [PATCH] Don't link the winelibs with libboost_filesystem

It's not actually used anywhere.
---
 CHANGELOG.md |  1 +
 README.md    |  2 +-
 meson.build  | 13 +++++--------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cd9dcf79..b5ed748f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -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
 
diff --git a/README.md b/README.md
index 202a93cf..e1bbe9cf 100644
--- a/README.md
+++ b/README.md
@@ -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
diff --git a/meson.build b/meson.build
index 0390ed4f..1a6c8c5b 100644
--- a/meson.build
+++ b/meson.build
@@ -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(