diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-26 20:53:04 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-11-26 20:59:56 +0300 |
| commit | 218c6a55b8eda886489cb93f11a4ee5dd3b8b84b (patch) | |
| tree | 6cc760ea044006dd04454b66f59d6bda5feba4f0 /g15helper | |
| parent | 89045910bb8d01f2053246a6f0447b96c786210f (diff) | |
g15helper: statically link against runtime library on Windows.
The mumble-g15-helper.exe binary is always 32-bit on Windows.
However, we don't ship 32-bit VCRedist for 64-bit Mumble builds.
This change forces us to always statically link mumble-g15-helper.exe
to ensure that it works on 64-bit systems without 32-bit VCRedist
manually installed.
Fixes mumble-voip/mumble#1692
Diffstat (limited to 'g15helper')
| -rw-r--r-- | g15helper/g15helper.pro | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/g15helper/g15helper.pro b/g15helper/g15helper.pro index fca0b7ea3..2517476ac 100644 --- a/g15helper/g15helper.pro +++ b/g15helper/g15helper.pro @@ -18,6 +18,20 @@ win32 { INCLUDEPATH *= "$$G15SDK_PATH/Src" DEFINES *= WIN32 QMAKE_POST_LINK = $$QMAKE_POST_LINK$$escape_expand(\\n\\t)$$quote(mt.exe -nologo -updateresource:$(DESTDIR_TARGET);1 -manifest ../src/mumble/mumble.appcompat.manifest) + + CONFIG(release, debug|release) { + QMAKE_CFLAGS_RELEASE -= -MD + QMAKE_CFLAGS_RELEASE *= -MT + QMAKE_CXXFLAGS_RELEASE -= -MD + QMAKE_CXXFLAGS_RELEASE *= -MT + } + CONFIG(debug, debug|release) { + QMAKE_CFLAGS_DEBUG -= -MDd + QMAKE_CFLAGS_DEBUG *= -MTd + QMAKE_CXXFLAGS_DEBUG -= -MDd + QMAKE_CXXFLAGS_DEBUG *= -MTd + } + } macx { |