From 9eafe4e274583ea49364971f58a01d04abdec3df Mon Sep 17 00:00:00 2001
From: James Turner <james@flightgear.org>
Date: Thu, 20 May 2021 09:31:45 +0100
Subject: [PATCH] AppImage: more tweaks to Linux build

Use RelWithDebInfo, switch to ninja, and fix the OSG-36 lib path
---
 build_appimage.sh      |  6 +++++-
 build_release_linux.sh | 16 ++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build_appimage.sh b/build_appimage.sh
index 9176bef..cff9fe0 100755
--- a/build_appimage.sh
+++ b/build_appimage.sh
@@ -40,7 +40,11 @@ mkdir -p appdir/usr/ssl
 
 cp dist/bin/* appdir/usr/bin
 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
 
 # FIXME : only copy the QML plugins we actually need
diff --git a/build_release_linux.sh b/build_release_linux.sh
index d14b310..202d231 100755
--- a/build_release_linux.sh
+++ b/build_release_linux.sh
@@ -22,38 +22,38 @@ rm -rf output/*
 #####################################################################################
 echo "Starting on SimGear"
 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
-make
+ninja
 
 if [ $? -ne '0' ]; then
     echo "make simgear failed"
     exit 1
 fi
 
-make install
+ninja install
 
 # build source package and copy to output
-make package_source
+ninja package_source
 cp simgear-*.tar.bz2 ../output/.
 
 #####################################################################################
 echo "Starting on FlightGear"
 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
-make
+ninja
 
 if [ $? -ne '0' ]; then
     echo "make flightgear failed"
     exit 1
 fi
 
-make install
+ninja install
 
 # build source package and copy to output
-make package_source
+ninja package_source
 cp flightgear-*.tar.bz2 ../output/.