fly/fgmeta
1
0
Fork 0
Code Activity

AppImage: more tweaks to Linux build

Browse source 
Use RelWithDebInfo, switch to ninja, and fix the OSG-36 lib path
This commit is contained in:
James Turner 2021-05-20 09:31:45 +01:00
parent 178cdbe216
commit 9eafe4e274
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build_appimage.sh
View file

@ -40,7 +40,11 @@ mkdir -p appdir/usr/ssl
cp dist/bin/* appdir/usr/bin cp dist/bin/* appdir/usr/bin
cp -d dist/lib64/* appdir/usr/lib cp -d dist/lib64/* appdir/usr/lib
cp -a dist/lib64/osgPlugins-3.6.5 appdir/usr/lib
# OSG 3.6 uses lib, not lib64
cp -d dist/lib/* appdir/usr/lib
cp -a dist/lib/osgPlugins-3.6.5 appdir/usr/lib
cp -r dist/share appdir/usr cp -r dist/share appdir/usr
# FIXME : only copy the QML plugins we actually need # FIXME : only copy the QML plugins we actually need

16
build_release_linux.sh
View file

@ -22,38 +22,38 @@ rm -rf output/*
##################################################################################### #####################################################################################
echo "Starting on SimGear" echo "Starting on SimGear"
cd sgBuild cd sgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" ../simgear cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DENABLE_DNS:BOOL="ON" -DSIMGEAR_SHARED:BOOL="ON" -DCMAKE_BUILD_TYPE=RelWithDebInfo ../simgear
# compile # compile
make ninja
if [ $? -ne '0' ]; then if [ $? -ne '0' ]; then
echo "make simgear failed" echo "make simgear failed"
exit 1 exit 1
fi fi
make install ninja install
# build source package and copy to output # build source package and copy to output
make package_source ninja package_source
cp simgear-*.tar.bz2 ../output/. cp simgear-*.tar.bz2 ../output/.
##################################################################################### #####################################################################################
echo "Starting on FlightGear" echo "Starting on FlightGear"
cd ../fgBuild cd ../fgBuild
cmake -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_SWIFT:BOOL=ON -DFG_BUILD_TYPE=Release ../flightgear cmake -G Ninja -DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/dist -DSIMGEAR_SHARED:BOOL="ON" -DENABLE_SWIFT:BOOL=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFG_BUILD_TYPE=Release ../flightgear
# compile # compile
make ninja
if [ $? -ne '0' ]; then if [ $? -ne '0' ]; then
echo "make flightgear failed" echo "make flightgear failed"
exit 1 exit 1
fi fi
make install ninja install
# build source package and copy to output # build source package and copy to output
make package_source ninja package_source
cp flightgear-*.tar.bz2 ../output/. cp flightgear-*.tar.bz2 ../output/.