From 7ce60c247a0bf325482991566a035f5ba2229380 Mon Sep 17 00:00:00 2001 From: Lukas W Date: Sat, 8 Apr 2017 23:56:07 +0200 Subject: [PATCH] Travis: Add missing packages --- .travis/linux..install.sh | 6 ++++-- src/gui/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.travis/linux..install.sh b/.travis/linux..install.sh index f5988a83d..8174f9786 100644 --- a/.travis/linux..install.sh +++ b/.travis/linux..install.sh @@ -2,11 +2,13 @@ PACKAGES="cmake libsndfile-dev fftw3-dev libvorbis-dev libogg-dev libmp3lame-dev libasound2-dev libjack-dev libsdl-dev libsamplerate0-dev libstk0-dev - libfluidsynth-dev portaudio19-dev wine-dev g++-multilib libfltk1.3-dev + libfluidsynth-dev portaudio19-dev g++-multilib libfltk1.3-dev libgig-dev libsoundio-dev" +VST_PACKAGES="wine-dev libqt5x11extras5-dev qtbase5-private-dev libxcb-util-dev libxcb-keysyms1-dev" + # Help with unmet dependencies -PACKAGES="$PACKAGES libjack0" +PACKAGES="$PACKAGES $VST_PACKAGES libjack0" if [ $QT5 ]; then PACKAGES="$PACKAGES qtbase5-dev qttools5-dev-tools qttools5-dev" diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 58fb8e2dd..3373945ed 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -91,7 +91,7 @@ SET(LMMS_SRCS PARENT_SCOPE ) -IF(QT5) +IF(QT5 AND LMMS_BUILD_LINUX) add_library(x11embedcontainer STATIC X11EmbedContainer )