StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2990

Browse Source 
Erik Edrosa (3):
      remove hard coded system tray include paths
      Update list of dependencies with pkg-config
      add ffmpeg libraries to PKGCONFIG
This commit is contained in:
sudden6 2016-03-26 10:45:47 +01:00
commit 0330cd7627
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 41 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.md
View File

@ -39,7 +39,7 @@
## Dependencies ## Dependencies
| Name | Version | Modules | | Name | Version | Modules |
|--------------|-------------|-------------------------------------------------- | |---------------|-------------|-------------------------------------------------- |
| Qt | >= 5.3.0 | core, gui, network, opengl, sql, svg, widget, xml | | Qt | >= 5.3.0 | core, gui, network, opengl, sql, svg, widget, xml |
| GCC/MinGW | >= 4.8 | C++11 enabled | | GCC/MinGW | >= 4.8 | C++11 enabled |
| toxcore | most recent | core, av | | toxcore | most recent | core, av |
@ -49,7 +49,7 @@
| qrencode | >= 3.0.3 | | | qrencode | >= 3.0.3 | |
| sqlcipher | >= 3.2.0 | | | sqlcipher | >= 3.2.0 | |
| libXScrnSaver | >= 1.2 | | | libXScrnSaver | >= 1.2 | |
| pkg-config | >= 0.28 | |
<a name="linux" /> <a name="linux" />

90
qtox.pro
View File

@ -39,6 +39,7 @@ FORMS += \
src/widget/about/aboutuser.ui src/widget/about/aboutuser.ui
CONFIG += c++11 CONFIG += c++11
CONFIG += link_pkgconfig
QMAKE_CXXFLAGS += -fno-exceptions QMAKE_CXXFLAGS += -fno-exceptions
@ -220,65 +221,26 @@ win32 {
} }
} }
# The systray Unity backend implements the system tray icon on Unity (Ubuntu) and GNOME desktops.
unix:!macx:!android { unix:!macx:!android {
# The systray Unity backend implements the system tray icon on Unity (Ubuntu) and GNOME desktops.
contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) { contains(ENABLE_SYSTRAY_UNITY_BACKEND, YES) {
DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND DEFINES += ENABLE_SYSTRAY_UNITY_BACKEND
INCLUDEPATH += "/usr/include/glib-2.0" PKGCONFIG += glib-2.0 gtk+-2.0 atk
INCLUDEPATH += "/usr/include/gtk-2.0" PKGCONFIG += cairo gdk-pixbuf-2.0 pango
INCLUDEPATH += "/usr/include/atk-1.0" PKGCONFIG += libavformat libavdevice libavcodec
INCLUDEPATH += "/usr/include/cairo" PKGCONFIG += libavutil libswscale
INCLUDEPATH += "/usr/include/ffmpeg" PKGCONFIG += appindicator-0.1 dbusmenu-glib-0.4
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"
equals(QT_ARCH, x86_64) {
INCLUDEPATH += "/usr/lib64/glib-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
}
else {
INCLUDEPATH += "/usr/lib/glib-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
}
LIBS += -lgobject-2.0 -lappindicator -lgtk-x11-2.0
}
} }
# The systray Status Notifier backend implements the system tray icon on KDE and compatible desktops # The systray Status Notifier backend implements the system tray icon on KDE and compatible desktops
unix:!macx:!android { !contains(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND, NO) {
contains(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND, NO) {
} else {
DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND DEFINES += ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND
INCLUDEPATH += "/usr/include/glib-2.0" PKGCONFIG += glib-2.0 gtk+-2.0 atk
INCLUDEPATH += "/usr/include/gtk-2.0" PKGCONFIG += cairo gdk-pixbuf-2.0 pango
INCLUDEPATH += "/usr/include/atk-1.0" PKGCONFIG += libavformat libavdevice libavcodec
INCLUDEPATH += "/usr/include/cairo" PKGCONFIG += libavutil libswscale
INCLUDEPATH += "/usr/include/ffmpeg"
INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
INCLUDEPATH += "/usr/include/pango-1.0"
equals(QT_ARCH, x86_64) {
INCLUDEPATH += "/usr/lib64/glib-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
}
else {
INCLUDEPATH += "/usr/lib/glib-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
}
LIBS += -lglib-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lcairo -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0
SOURCES += src/platform/statusnotifier/closures.c \ SOURCES += src/platform/statusnotifier/closures.c \
src/platform/statusnotifier/enums.c \ src/platform/statusnotifier/enums.c \
@ -289,35 +251,13 @@ contains(ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND, NO) {
src/platform/statusnotifier/interfaces.h \ src/platform/statusnotifier/interfaces.h \
src/platform/statusnotifier/statusnotifier.h src/platform/statusnotifier/statusnotifier.h
} }
}
# The systray GTK backend implements a system tray icon compatible with many systems # The systray GTK backend implements a system tray icon compatible with many systems
unix:!macx:!android { !contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
contains(ENABLE_SYSTRAY_GTK_BACKEND, NO) {
} else {
DEFINES += ENABLE_SYSTRAY_GTK_BACKEND DEFINES += ENABLE_SYSTRAY_GTK_BACKEND
INCLUDEPATH += "/usr/include/glib-2.0" PKGCONFIG += glib-2.0 gtk+-2.0 atk
INCLUDEPATH += "/usr/include/gtk-2.0" PKGCONFIG += gdk-pixbuf-2.0 cairo pango
INCLUDEPATH += "/usr/include/atk-1.0"
INCLUDEPATH += "/usr/include/gdk-pixbuf-2.0"
INCLUDEPATH += "/usr/include/cairo"
INCLUDEPATH += "/usr/include/pango-1.0"
equals(QT_ARCH, x86_64) {
INCLUDEPATH += "/usr/lib64/glib-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib64/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/x86_64-linux-gnu/gtk-2.0/include"
}
else {
INCLUDEPATH += "/usr/lib/glib-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/glib-2.0/include"
INCLUDEPATH += "/usr/lib/gtk-2.0/include"
INCLUDEPATH += "/usr/lib/i386-linux-gnu/gtk-2.0/include"
}
LIBS += -lglib-2.0 -lgdk_pixbuf-2.0 -lgio-2.0 -lcairo -lgtk-x11-2.0 -lgdk-x11-2.0 -lgobject-2.0
} }
} }