From 257e48a80d534fd17af76de94281b6da68b199db Mon Sep 17 00:00:00 2001 From: wallcarpet40 Date: Fri, 31 Jan 2025 17:35:18 +0200 Subject: [PATCH] Fix Linux build and some typos --- scripts/linux_build.sh | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) mode change 100644 => 100755 scripts/linux_build.sh diff --git a/scripts/linux_build.sh b/scripts/linux_build.sh old mode 100644 new mode 100755 index 24ec0227..4bfd4393 --- a/scripts/linux_build.sh +++ b/scripts/linux_build.sh @@ -85,7 +85,7 @@ shift $((OPTIND -1)) # dependencies array to build out dependencies=() -function add_debain_based_deps() { +function add_debian_based_deps() { dependencies+=( "bison" # required if we need to compile doxygen "build-essential" @@ -128,8 +128,8 @@ function add_debain_based_deps() { fi } -function add_debain_deps() { - add_debain_based_deps +function add_debian_deps() { + add_debian_based_deps dependencies+=( "libayatana-appindicator3-dev" ) @@ -141,7 +141,7 @@ function add_ubuntu_deps() { ${sudo_cmd} add-apt-repository ppa:ubuntu-toolchain-r/test -y fi - add_debain_based_deps + add_debian_based_deps dependencies+=( "libappindicator3-dev" ) @@ -276,7 +276,9 @@ function run_install() { "-DSUNSHINE_ENABLE_WAYLAND=ON" "-DSUNSHINE_ENABLE_X11=ON" "-DSUNSHINE_ENABLE_DRM=ON" - ) + "-DBUILD_TESTS=false" + "-DBUILD_DOCS=false" + ) if [ "$appimage_build" == 1 ]; then cmake_args+=("-DSUNSHINE_BUILD_APPIMAGE=ON") @@ -297,7 +299,7 @@ function run_install() { $package_update_command if [ "$distro" == "debian" ]; then - add_debain_deps + add_debian_deps elif [ "$distro" == "ubuntu" ]; then add_ubuntu_deps elif [ "$distro" == "fedora" ] && [ "$version" == "41" ]; then @@ -314,8 +316,8 @@ function run_install() { # reload the environment # shellcheck source=/dev/null - source ~/.bashrc - + # source ~/.bashrc + gcc_alternative_files=( "gcc" "g++" @@ -394,6 +396,8 @@ function run_install() { install_cuda cmake_args+=("-DSUNSHINE_ENABLE_CUDA=ON") cmake_args+=("-DCMAKE_CUDA_COMPILER:PATH=${build_dir}/cuda/bin/nvcc") + else + cmake_args+=("-DSUNSHINE_ENABLE_CUDA=OFF") fi # Cmake stuff here