From 27697bb63843d39890af5c27ec54a939c258eda7 Mon Sep 17 00:00:00 2001 From: Ryzerth Date: Mon, 26 Apr 2021 16:55:55 +0200 Subject: [PATCH] More bionic compatibility --- core/src/config.cpp | 5 +++++ docker_builds/ubuntu_bionic/do_build.sh | 11 +++++++---- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/core/src/config.cpp b/core/src/config.cpp index 49d24057..b92531c3 100644 --- a/core/src/config.cpp +++ b/core/src/config.cpp @@ -1,7 +1,12 @@ #include #include #include + +#ifdef USE_EXPERIMENTAL_FS +#include +#else #include +#endif ConfigManager::ConfigManager() { diff --git a/docker_builds/ubuntu_bionic/do_build.sh b/docker_builds/ubuntu_bionic/do_build.sh index 94aec9a5..2abfecb5 100644 --- a/docker_builds/ubuntu_bionic/do_build.sh +++ b/docker_builds/ubuntu_bionic/do_build.sh @@ -2,12 +2,15 @@ set -e cd /root - apt update -apt install -y dpkg-dev make gcc-8 g++-8 cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev +apt install -y software-properties-common +add-apt-repository -y ppa:ubuntu-toolchain-r/test +apt update + +apt install -y dpkg-dev make gcc-10 g++-10 cmake git libfftw3-dev libglfw3-dev libglew-dev libvolk1-dev libsoapysdr-dev libairspyhf-dev libairspy-dev libiio-dev libad9361-dev librtaudio-dev libhackrf-dev librtlsdr-dev update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 700 --slave /usr/bin/g++ g++ /usr/bin/g++-7 -update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 800 --slave /usr/bin/g++ g++ /usr/bin/g++-8 +update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 1000 --slave /usr/bin/g++ g++ /usr/bin/g++-10 git clone https://github.com/AlexandreRouma/SDRPlusPlus @@ -15,7 +18,7 @@ cd SDRPlusPlus mkdir build cd build cmake .. -make CXX_FLAGS=-DUSE_OLD_VOLK_ADD=1 -j2 +make CXX_FLAGS='-DUSE_OLD_VOLK_ADD=1 -DUSE_EXPERIMENTAL_FS=1' -j2 cd .. sh make_debian_package.sh ./build \ No newline at end of file