Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavide Beatrici <davidebeatrici@gmail.com>2018-07-13 23:48:15 +0300
committerGitHub <noreply@github.com>2018-07-13 23:48:15 +0300
commit5039340a4c4ba4073f9518e614a9e45d235639b8 (patch)
tree190fddb18f7364fabdc3a860f2d464c61282a722 /src
parent68cfcc40f31870e4847b7bbc96cc6041cd6de533 (diff)
parent6ac6ae8f4ff940d59f6b1831d0ca4f0ad85495bb (diff)
Merge PR #3370: Fix Boost library link for MSYS2
Diffstat (limited to 'src')
-rw-r--r--src/mumble/mumble.pro9
1 files changed, 8 insertions, 1 deletions
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
index 5634a5df8..d297a6d4e 100644
--- a/src/mumble/mumble.pro
+++ b/src/mumble/mumble.pro
@@ -410,7 +410,14 @@ win32 {
LIBS *= -llibboost_system-mt -llibboost_thread-mt
}
win32-g++ {
- LIBS *= -lboost_system-mt -lboost_thread_win32-mt
+ LIBS *= -lboost_system-mt
+
+ # The library has a different name in MXE
+ contains(QMAKE_HOST.os, Linux) {
+ LIBS *= -lboost_thread_win32-mt
+ } else {
+ LIBS *= -lboost_thread-mt
+ }
}
LIBS *= -ldelayimp -delayload:shell32.dll