diff options
| author | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-03 22:13:21 +0300 |
|---|---|---|
| committer | Mikkel Krautz <mikkel@krautz.dk> | 2015-01-03 22:13:26 +0300 |
| commit | a2bb65964decc8c9de32789142ced2fb67e14405 (patch) | |
| tree | 956ae80f32e0a5706874ff71b69e026d82fd1ad6 /src/murmur/murmur.pro | |
| parent | ecf543b23e3cc746c435a58032b0d0a7146b4574 (diff) | |
murmur: move murmur.pro's CONFIG(static) and CONFIG(ermine) sections into the unix section.
Fixes a linker warning on Windows, where "-static"
was inadvertently added to the link.exe flags.
Diffstat (limited to 'src/murmur/murmur.pro')
| -rw-r--r-- | src/murmur/murmur.pro | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/murmur/murmur.pro b/src/murmur/murmur.pro index 194ae31ce..eda3c04e9 100644 --- a/src/murmur/murmur.pro +++ b/src/murmur/murmur.pro @@ -3,12 +3,6 @@ include(../mumble.pri) DEFINES *= MURMUR TEMPLATE =app CONFIG *= network -CONFIG(static):!macx { - QMAKE_LFLAGS *= -static -} -CONFIG(ermine) { - QMAKE_LFLAGS *= -Wl,-rpath,$$(MUMBLE_PREFIX)/lib:$$(MUMBLE_ICE_PREFIX)/lib -} CONFIG -= gui QT *= network sql xml QT -= gui @@ -52,6 +46,14 @@ unix { LIBS *= -lcap } + CONFIG(static) { + QMAKE_LFLAGS *= -static + } + + CONFIG(ermine) { + QMAKE_LFLAGS *= -Wl,-rpath,$$(MUMBLE_PREFIX)/lib:$$(MUMBLE_ICE_PREFIX)/lib + } + HEADERS *= UnixMurmur.h SOURCES *= UnixMurmur.cpp TARGET = murmurd |