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

qTox · Jul 6, 2016 · 2d06b99 · 2d06b99
1 parent 99ce719
commit 2d06b99
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/.travis/build-ubuntu_14_04.sh b/.travis/build-ubuntu_14_04.sh
@@ -117,6 +117,10 @@ cd ..
 
 $CC --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
 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

diff --git a/qtox.pro b/qtox.pro
@@ -173,8 +173,6 @@ unix:!macx {
 
         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
     }
 
@@ -184,8 +182,6 @@ unix:!macx {
 
         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 \
@@ -204,6 +200,10 @@ unix:!macx {
         PKGCONFIG += glib-2.0 gtk+-2.0 atk
         PKGCONFIG += gdk-pixbuf-2.0 cairo pango
     }
+
+    # ffmpeg
+    PKGCONFIG += libavformat libavdevice libavcodec
+    PKGCONFIG += libavutil libswscale
 }
 
 win32 {