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

fix(qtox.pro): don't depend on GTK in order to build on Linux

Browse Source
This commit is contained in:
Zetok Zalbavar 2016-07-05 03:37:26 +01:00
parent 99ce719b80
commit 2d06b9960c
No known key found for this signature in database
GPG Key ID: C953D3880212068A
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis/build-ubuntu_14_04.sh
View File

@ -117,6 +117,10 @@ cd ..
$CC --version $CC --version
$CXX --version $CXX --version
# needed, otherwise ffmpeg doesn't get detected
export PKG_CONFIG_PATH="$PWD/libs/lib/pkgconfig"
# first build qTox without support for optional dependencies # first build qTox without support for optional dependencies
echo '*** BUILDING "MINIMAL" VERSION ***' echo '*** BUILDING "MINIMAL" VERSION ***'
qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES qmake qtox.pro QMAKE_CC="$CC" QMAKE_CXX="$CXX" ENABLE_SYSTRAY_STATUSNOTIFIER_BACKEND=NO ENABLE_SYSTRAY_GTK_BACKEND=NO DISABLE_PLATFORM_EXT=YES

8
qtox.pro
View File

@ -173,8 +173,6 @@ unix:!macx {
PKGCONFIG += glib-2.0 gtk+-2.0 atk PKGCONFIG += glib-2.0 gtk+-2.0 atk
PKGCONFIG += cairo gdk-pixbuf-2.0 pango PKGCONFIG += cairo gdk-pixbuf-2.0 pango
PKGCONFIG += libavformat libavdevice libavcodec
PKGCONFIG += libavutil libswscale
PKGCONFIG += appindicator-0.1 dbusmenu-glib-0.4 PKGCONFIG += appindicator-0.1 dbusmenu-glib-0.4
} }
@ -184,8 +182,6 @@ unix:!macx {
PKGCONFIG += glib-2.0 gtk+-2.0 atk PKGCONFIG += glib-2.0 gtk+-2.0 atk
PKGCONFIG += cairo gdk-pixbuf-2.0 pango PKGCONFIG += cairo gdk-pixbuf-2.0 pango
PKGCONFIG += libavformat libavdevice libavcodec
PKGCONFIG += libavutil libswscale
SOURCES += src/platform/statusnotifier/closures.c \ SOURCES += src/platform/statusnotifier/closures.c \
src/platform/statusnotifier/enums.c \ src/platform/statusnotifier/enums.c \
@ -204,6 +200,10 @@ unix:!macx {
PKGCONFIG += glib-2.0 gtk+-2.0 atk PKGCONFIG += glib-2.0 gtk+-2.0 atk
PKGCONFIG += gdk-pixbuf-2.0 cairo pango PKGCONFIG += gdk-pixbuf-2.0 cairo pango
} }
# ffmpeg
PKGCONFIG += libavformat libavdevice libavcodec
PKGCONFIG += libavutil libswscale
} }
win32 { win32 {