From 2ec206b97a25821cbe784b778823a6907e12d68e Mon Sep 17 00:00:00 2001 From: Zetok Zalbavar Date: Thu, 26 Feb 2015 17:56:20 +0000 Subject: [PATCH] [qtox.pro] fix building with support for libappindicator * added INCLUDEPATHs for libappindicator support * added INCLUDEPATHs for GTK tray backend * sorted some INCLUDEPATHs --- qtox.pro | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) diff --git a/qtox.pro b/qtox.pro index aa70ccce6..afe4fa11d 100644 --- a/qtox.pro +++ b/qtox.pro @@ -192,18 +192,22 @@ unix:!macx:!android { contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) { DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND - INCLUDEPATH += "/usr/include/libappindicator-0.1" - INCLUDEPATH += "/usr/include/gtk-2.0" INCLUDEPATH += "/usr/include/glib-2.0" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/lib/glib-2.0/include" + INCLUDEPATH += "/usr/lib64/glib-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" - INCLUDEPATH += "/usr/include/cairo" - INCLUDEPATH += "/usr/include/pango-1.0" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/include/gtk-2.0" + INCLUDEPATH += "/usr/lib/gtk-2.0/include" + INCLUDEPATH += "/usr/lib64/gtk-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" - INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" INCLUDEPATH += "/usr/include/atk-1.0" + INCLUDEPATH += "/usr/include/cairo" + INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" + INCLUDEPATH += "/usr/include/libappindicator-0.1" INCLUDEPATH += "/usr/include/libdbusmenu-glib-0.4" + INCLUDEPATH += "/usr/include/pango-1.0" LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0 } @@ -215,19 +219,19 @@ contains(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND, NO) { } else { DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND - INCLUDEPATH += "/usr/include/gtk-2.0" INCLUDEPATH += "/usr/include/glib-2.0" INCLUDEPATH += "/usr/lib/glib-2.0/include" INCLUDEPATH += "/usr/lib64/glib-2.0/include" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/include/gtk-2.0" INCLUDEPATH += "/usr/lib/gtk-2.0/include" INCLUDEPATH += "/usr/lib64/gtk-2.0/include" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" INCLUDEPATH += "/usr/include/atk-1.0" - INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" INCLUDEPATH += "/usr/include/cairo" + INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" INCLUDEPATH += "/usr/include/pango-1.0" @@ -250,14 +254,16 @@ contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) { } else { DEFINES += ENABLE_SYSTRAY_GTK_BACKEND - INCLUDEPATH += "/usr/include/gtk-2.0" INCLUDEPATH += "/usr/include/glib-2.0" INCLUDEPATH += "/usr/lib/glib-2.0/include" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/lib64/glib-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include" + INCLUDEPATH += "/usr/include/gtk-2.0" INCLUDEPATH += "/usr/lib/gtk-2.0/include" - INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" + INCLUDEPATH += "/usr/lib64/gtk-2.0/include" INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include" + INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include" INCLUDEPATH += "/usr/include/atk-1.0" INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0" INCLUDEPATH += "/usr/include/cairo"