kiwix/kiwix-tools
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-tools.git synced 2025-09-23 03:52:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update build system as we don't use ctpp2 anymore.

Browse Source
This commit is contained in:
Matthieu Gautier 2019-01-23 15:46:14 +01:00
parent 7ac14aa64f
commit 7b25308248
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
travis/compile.sh
View File

@ -24,6 +24,6 @@ esac
cd ${TRAVIS_BUILD_DIR} cd ${TRAVIS_BUILD_DIR}
export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/x86_64-linux-gnu/pkgconfig export PKG_CONFIG_PATH=${INSTALL_DIR}/lib/x86_64-linux-gnu/pkgconfig
export PATH=${INSTALL_DIR}/bin:$PATH export PATH=${INSTALL_DIR}/bin:$PATH
meson . build -Dctpp2-install-prefix=${INSTALL_DIR} ${MESON_OPTION} meson . build ${MESON_OPTION}
cd build cd build
ninja ninja

4
travis/install_deps.sh
View File

@ -8,10 +8,10 @@ ARCHIVE_NAME=deps_${TRAVIS_OS_NAME}_${PLATFORM}_${REPO_NAME}.tar.gz
# Packages. # Packages.
case ${PLATFORM} in case ${PLATFORM} in
"native_static") "native_static")
PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev" PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev"
;; ;;
"native_dyn") "native_dyn")
PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libctpp2-dev libmicrohttpd-dev" PACKAGES="gcc cmake libbz2-dev ccache zlib1g-dev uuid-dev libmicrohttpd-dev"
;; ;;
"win32_static") "win32_static")
PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache" PACKAGES="g++-mingw-w64-i686 gcc-mingw-w64-i686 gcc-mingw-w64-base mingw-w64-tools ccache"