From ce949480009e8ac4df6e81173c4e312958913605 Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Sat, 20 Oct 2018 08:15:27 +0200 Subject: Refactoring:navit/maptool:build with external protobuf-c (#650) --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '.circleci') diff --git a/.circleci/config.yml b/.circleci/config.yml index 69facbbae..46d1aad86 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -65,7 +65,7 @@ jobs: name: Install cmake gettext libsaxonb-java librsvg2-bin pkg-config command: | sudo apt-get update - sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config + sudo apt-get install -y cmake gettext libsaxonb-java librsvg2-bin pkg-config libprotobuf-c-dev protobuf-c-compiler cmake ./ -Dsvg2png_scaling:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_nav:STRING=-1,24,32,48,64,96,128 -Dsvg2png_scaling_flag:STRING=-1,24,32,64,96 - run: name: Process icons @@ -160,7 +160,7 @@ jobs: - run: name: Build for Windows command: | - bash scripts/setup_common_requirements.sh + apt-get update && xargs -a scripts/setup_14.04_requirements.list apt-get install -y bash scripts/build_win32.sh - store_artifacts: path: win32/navit.exe -- cgit v1.2.1