Merge branch 'develop' into 'develop'
Develop See merge request aleajactaest/khanat-opennel-code!1
This commit is contained in:
commit
9ccff24a1f
1 changed files with 4 additions and 4 deletions
|
@ -6,8 +6,8 @@
|
|||
stages:
|
||||
- build
|
||||
- test
|
||||
- staging
|
||||
- production
|
||||
#- staging
|
||||
#- production
|
||||
|
||||
## BUILDS
|
||||
|
||||
|
@ -26,10 +26,10 @@ Linux client build:
|
|||
- optionproc="-j$(nproc --ignore=$disableproc)"
|
||||
- echo "disableproc:$disableproc, nb core compile:$(nproc --ignore=$disableproc) optionproc:$optionproc"
|
||||
# Installation des dépendances
|
||||
- echo "deb http://ftp.debian.org/debian/ jessie-backports non-free contrib main" >> /etc/apt/sources.list
|
||||
#- echo "deb http://ftp.debian.org/debian/ jessie-backports non-free contrib main" >> /etc/apt/sources.list
|
||||
- apt-get update
|
||||
- apt-get -y upgrade
|
||||
- apt-get -t jessie-backports install libxml2 -y g++ gcc cmake libcurl4-openssl-dev libgl1-mesa-dev libjpeg-dev libpng-dev libopenal-dev libfreetype6-dev libxxf86vm-dev libxrandr-dev libxrender-dev libvorbis-dev libluabind-dev libboost-dev libmysqlclient-dev libssl-dev liblzma-dev libxml2-dev makeself libgif-dev
|
||||
- apt-get install libxml2 -y g++ gcc cmake libcurl4-openssl-dev libgl1-mesa-dev libjpeg-dev libpng-dev libopenal-dev libfreetype6-dev libxxf86vm-dev libxrandr-dev libxrender-dev libvorbis-dev libluabind-dev libboost-dev libmysqlclient-dev libssl-dev liblzma-dev libxml2-dev makeself libgif-dev
|
||||
# Installation des dépendances des dépendances statiques (à commenter si construction de Khanat en mode dynamique)
|
||||
# libxml2 : python-pyicu (support d'unicode), python-dev (support de... python)
|
||||
- apt-get install -y wget python-pyicu python-dev
|
||||
|
|
Loading…
Reference in a new issue