From 0500a420aa7673ab58d650138f36cc2f4da1bd65 Mon Sep 17 00:00:00 2001 From: Mikkel Krautz Date: Sun, 26 Mar 2017 22:22:15 +0200 Subject: [PATCH] mumble.pri: use protobuf.pri. This removes the ad-hoc protobuf dependency code from mumble.pri, and replaces it with an include of the newly introduced protobuf.pri helper. --- src/mumble.pri | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/mumble.pri b/src/mumble.pri index e12f263ec..0db081fbb 100644 --- a/src/mumble.pri +++ b/src/mumble.pri @@ -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