diff --git a/INSTALL b/INSTALL index 695aa89cbbb..d713be67f17 100644 --- a/INSTALL +++ b/INSTALL @@ -157,3 +157,7 @@ CONFIG+=no-xinput2 (Mumble, Linux) CONFIG+=no-xboxinput (Mumble, Win32) Don't build in support for global shortcuts from Xbox controllers via the XInput DLL. + +CONFIG+=dpkg-buildflags + Add CFLAGS, CXXFLAGS, CPPFLAGS and LDFLAGS + from dpkg-buildflags to Mumble's build flags. diff --git a/compiler.pri b/compiler.pri index 110ed97ed7f..455b816c7cb 100644 --- a/compiler.pri +++ b/compiler.pri @@ -111,6 +111,14 @@ unix { } unix:!macx { + CONFIG(dpkg-buildflags) { + QMAKE_CFLAGS *= $$system(dpkg-buildflags --get CFLAGS) + QMAKE_CXXFLAGS *= $$system(dpkg-buildflags --get CXXFLAGS) + QMAKE_CPPFLAGS *= $$system(dpkg-buildflags --get CPPFLAGS) + QMAKE_LFLAGS *= $$system(dpkg-buildflags --get LDFLAGS) + } + + CONFIG(debug, debug|release) { QMAKE_CFLAGS *= -fstack-protector -fPIE -pie QMAKE_CXXFLAGS *= -fstack-protector -fPIE -pie