2021-12-19 01:06:50 +00:00
|
|
|
diff --git a/meson.build b/meson.build
|
2023-05-24 13:37:59 +00:00
|
|
|
index d8d9135b..717280d9 100644
|
2021-12-19 01:06:50 +00:00
|
|
|
--- a/meson.build
|
|
|
|
|
+++ b/meson.build
|
2023-03-15 16:39:30 +00:00
|
|
|
@@ -221,7 +221,7 @@ if is_64bit_system
|
2021-12-19 01:06:50 +00:00
|
|
|
xcb_64bit_dep = dependency('xcb')
|
|
|
|
|
endif
|
|
|
|
|
if with_32bit_libraries or with_bitbridge
|
|
|
|
|
- xcb_32bit_dep = winegcc.find_library('xcb')
|
|
|
|
|
+ xcb_32bit_dep = winegcc.find_library('xcb', dirs: ['@libxcb32@/lib'])
|
|
|
|
|
endif
|
|
|
|
|
|
|
|
|
|
# These are all headers-only libraries, and thus won't require separate 32-bit
|
|
|
|
|
diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp
|
2023-05-24 13:37:59 +00:00
|
|
|
index 4a52b6c1..abbb1ec8 100644
|
2021-12-19 01:06:50 +00:00
|
|
|
--- a/src/plugin/utils.cpp
|
|
|
|
|
+++ b/src/plugin/utils.cpp
|
2023-05-24 13:37:59 +00:00
|
|
|
@@ -101,7 +101,7 @@ std::string PluginInfo::wine_version() const {
|
2022-07-18 16:21:45 +00:00
|
|
|
// The '*.exe' scripts generated by winegcc allow you to override the binary
|
|
|
|
|
// used to run Wine, so will will handle this in the same way for our Wine
|
|
|
|
|
// version detection. We'll be using `execvpe`
|
|
|
|
|
- std::string wine_path = "wine";
|
|
|
|
|
+ std::string wine_path = "@wine@/bin/wine";
|
|
|
|
|
// NOLINTNEXTLINE(concurrency-mt-unsafe)
|
|
|
|
|
if (const char* wineloader_path = getenv("WINELOADER");
|
|
|
|
|
wineloader_path && access(wineloader_path, X_OK) == 0) {
|
