pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #2990 

Erik Edrosa (3):
      remove hard coded system tray include paths
      Update list of dependencies with pkg-config
      add ffmpeg libraries to PKGCONFIG
pull/3054/merge
sudden6 9 years ago
parent
da2f892d63 44e7655546
commit
0330cd7627
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
2 changed files with 42 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      INSTALL.md
  2. 98
      qtox.pro

4
INSTALL.md
Unescape View File

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

98
qtox.pro
Unescape View File

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

Write Preview
Loading…
Cancel
Save