diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2017-07-24 23:31:31 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2017-07-24 23:31:31 +0300 |
| commit | f3aed2a5927b1f37667a13c280464245f282e92d (patch) | |
| tree | 392b92a506140bd81e1da8c4f6c88264528f4336 /src/murmur/murmur.pro | |
| parent | ac9fa6480f87a761748497dd642e0f2231817a2a (diff) | |
src/murmur: remove CONFIG(ermine), use CONFIG(buildenv) instead.
CONFIG(ermine) was used before we had CONFIG(buildenv).
All CONFIG(ermine) does is to try and use Ice from our build
environment.
Diffstat (limited to 'src/murmur/murmur.pro')
| -rw-r--r-- | src/murmur/murmur.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro index 4470672c0..bee4dc155 100644 --- a/src/murmur/murmur.pro +++ b/src/murmur/murmur.pro @@ -59,7 +59,7 @@ unix { QMAKE_LFLAGS *= -static } - CONFIG(ermine) { + !macx:CONFIG(buildenv) { QMAKE_LFLAGS *= -Wl,-rpath,$$(MUMBLE_PREFIX)/lib:$$(MUMBLE_ICE_PREFIX)/lib } @@ -116,7 +116,7 @@ ice { QMAKE_LIBDIR *= $$(MUMBLE_PREFIX)/Ice-3.4.2/lib/ } - CONFIG(ermine) { + unix:!macx:CONFIG(buildenv) { INCLUDEPATH *= $$(MUMBLE_ICE_PREFIX)/include/ QMAKE_LIBDIR *= $$(MUMBLE_ICE_PREFIX)/lib/ } |