mirrors/mumble
2
0
Fork 0
mirror of https://github.com/mumble-voip/mumble.git synced 2025-10-26 11:19:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mumble.pri: use protobuf.pri.

Browse Source 
This removes the ad-hoc protobuf dependency code from mumble.pri, and
replaces it with an include of the newly introduced protobuf.pri helper.
This commit is contained in:
Mikkel Krautz 2017-03-26 22:22:15 +02:00
parent 029f0b8fc9
commit 0500a420aa
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mumble.pri
View File

@ -36,15 +36,11 @@ CONFIG(packaged) {
# Add OpenSSL dependency
include(../qmake/openssl.pri)
win32-msvc* {
INCLUDEPATH *= "$$PROTOBUF_PATH/vsprojects/include" "$$PROTOBUF_PATH/src" protobuf
CONFIG(debug, debug|release) {
QMAKE_LIBDIR *= "$$PROTOBUF_PATH/vsprojects/Debug"
} else {
QMAKE_LIBDIR *= "$$PROTOBUF_PATH/vsprojects/Release"
}
# Add protobuf dependency
include(../qmake/protobuf.pri)
LIBS *= -llibprotobuf -lcrypt32 -lws2_32
win32-msvc* {
LIBS *= -lcrypt32 -lws2_32
LIBS *= -ldelayimp -lQwave -delayload:Qwave.DLL
}
@ -60,10 +56,6 @@ unix {
QMAKE_CFLAGS *= "-I../mumble_proto" "-isystem ../mumble_proto"
QMAKE_CXXFLAGS *= "-I../mumble_proto" "-isystem ../mumble_proto"
CONFIG *= link_pkgconfig
must_pkgconfig(protobuf)
}
# Make Q_DECL_OVERRIDE and Q_DECL_FINAL no-ops