diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2013-08-11 01:32:13 +0400 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2013-08-11 01:32:13 +0400 |
| commit | 91e3dafa53557bc40f14e2cbb011c3859f802ffe (patch) | |
| tree | 8e515efddfceb8c5e7d052efda1ed924dde1bf82 /plugins | |
| parent | 4c48f72ff7662a4571805b54dbeee0b687e0c169 (diff) | |
build: allow Mumble on Win32 to be built against a static Qt.
Also build-tested on OS X.
We currently disable the manual plugin when doing static builds
on Win32, because of manual.dll's Qt dependency.
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/plugins.pri | 1 | ||||
| -rw-r--r-- | plugins/plugins.pro | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/plugins/plugins.pri b/plugins/plugins.pri index 04e260c4f..8c49c2237 100644 --- a/plugins/plugins.pri +++ b/plugins/plugins.pri @@ -7,6 +7,7 @@ DIST *= mumble_plugin.h CONFIG(static) { CONFIG -= static + CONFIG += shared CONFIG += qt_dynamic_lookup } diff --git a/plugins/plugins.pro b/plugins/plugins.pro index 6c04efa5d..21d167b12 100644 --- a/plugins/plugins.pro +++ b/plugins/plugins.pro @@ -6,4 +6,12 @@ DIST = plugins.pri win32 { SUBDIRS += aoc arma2 bf1942 bf2 bf3 bf2142 bfbc2 bfheroes blacklight borderlands borderlands2 breach cod2 cod4 cod5 codmw2 codmw2so cs css dods dys etqw tf2 gmod gtaiv gw hl2dm insurgency jc2 l4d l4d2 lol lotro sr sto ut2004 ut3 ut99 wolfet wow + + # Temporarily disable the manual plugin + # for static builds on Windows. We'll + # have to figure out a smart way of allowing + # the manual plugin to access Qt symbols. + CONFIG(static) { + SUBDIRS -= manual + } } |