FGFS-4.1/fgmeta
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

download_and_compile.sh: dependency changes suggested by Pat Callahan

Browse Source
This commit is contained in:
Florent Rougon 2017-05-02 12:46:00 +02:00
parent b621bbe3e8
commit 5bf2814178
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
download_and_compile.sh
View File

@ -279,9 +279,12 @@ PKG="$PKG libcgal-dev libgdal-dev libtiff5-dev"
# TGGUI/OpenRTI # TGGUI/OpenRTI
PKG="$PKG libqt4-dev" PKG="$PKG libqt4-dev"
# SG/FG # SG/FG
PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev libopenscenegraph-dev" PKG="$PKG zlib1g-dev freeglut3-dev libboost-dev"
_package_alternative libopenscenegraph-3.4-dev libopenscenegraph-dev \
'libopenscenegraph-[0-9]+\.[0-9]+-dev'
# FG # FG
PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libpng12-dev libplib-dev" PKG="$PKG libopenal-dev libudev-dev qt5-default qtdeclarative5-dev libdbus-1-dev libplib-dev"
_package_alternative libpng-dev libpng12-dev libpng16-dev
# FGPanel # FGPanel
PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev" PKG="$PKG fluid libbz2-dev libfltk1.3-dev libxi-dev libxmu-dev"
# FGAdmin # FGAdmin
@ -444,7 +447,7 @@ if [[ "$(declare -p WHATTOBUILD)" =~ '['([0-9]+)']="OSG"' ]]; then
echo "****************************************" | tee -a $LOGFILE echo "****************************************" | tee -a $LOGFILE
cd "$CBD"/openscenegraph cd "$CBD"/openscenegraph
_gitDownload https://github.com/openscenegraph/osg.git _gitDownload https://github.com/openscenegraph/osg.git
_gitUpdate OpenSceneGraph-3.2 _gitUpdate OpenSceneGraph-3.4
if [ "$RECONFIGURE" = "y" ]; then if [ "$RECONFIGURE" = "y" ]; then
cd "$CBD" cd "$CBD"