diff options
| author | Liam <byteslice@airmail.cc> | 2024-01-08 15:34:16 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2024-01-08 15:34:32 +0100 |
| commit | 4f83b00f6f98cff94ccdec7bbcd664e576bd878e (patch) | |
| tree | 0180d0b8639ffed3953886097586dfb3e8dd6fcd | |
| parent | Merge pull request #12608 from szepeviktor/typos (diff) | |
| download | yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.gz yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.bz2 yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.lz yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.xz yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.zst yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.zip | |
Diffstat (limited to '')
| -rw-r--r-- | .ci/scripts/linux/exec.sh | 2 | ||||
| -rw-r--r-- | LICENSES/BSD-2-Clause.txt | 2 | ||||
| -rw-r--r-- | LICENSES/BSD-3-Clause.txt | 2 | ||||
| -rw-r--r-- | LICENSES/MPL-2.0.txt | 2 | ||||
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.ci/scripts/linux/exec.sh b/.ci/scripts/linux/exec.sh index fa3d78cc2..04e2486a1 100644 --- a/.ci/scripts/linux/exec.sh +++ b/.ci/scripts/linux/exec.sh @@ -9,7 +9,7 @@ chmod a+x ./.ci/scripts/linux/docker.sh sudo chown -R 1027 ./ # The environment variables listed below: -# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION +# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION # are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps docker run -e AZURECIREPO -e TITLEBARFORMATIDLE -e TITLEBARFORMATRUNNING -e DISPLAYVERSION -e ENABLE_COMPATIBILITY_REPORTING -e CCACHE_DIR=/yuzu/ccache -v "$(pwd):/yuzu" -w /yuzu yuzuemu/build-environments:linux-fresh /bin/bash /yuzu/.ci/scripts/linux/docker.sh "$1" diff --git a/LICENSES/BSD-2-Clause.txt b/LICENSES/BSD-2-Clause.txt index 5f662b354..eb3c575b8 100644 --- a/LICENSES/BSD-2-Clause.txt +++ b/LICENSES/BSD-2-Clause.txt @@ -1,4 +1,4 @@ -Copyright (c) <year> <owner> +Copyright (c) <year> <owner> Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/LICENSES/BSD-3-Clause.txt b/LICENSES/BSD-3-Clause.txt index ea890afbc..086d3992c 100644 --- a/LICENSES/BSD-3-Clause.txt +++ b/LICENSES/BSD-3-Clause.txt @@ -1,4 +1,4 @@ -Copyright (c) <year> <owner>. +Copyright (c) <year> <owner>. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff --git a/LICENSES/MPL-2.0.txt b/LICENSES/MPL-2.0.txt index 14e2f777f..a612ad981 100644 --- a/LICENSES/MPL-2.0.txt +++ b/LICENSES/MPL-2.0.txt @@ -35,7 +35,7 @@ Mozilla Public License Version 2.0 means any form of the work other than Source Code Form. 1.7. "Larger Work" - means a work that combines Covered Software with other material, in + means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software. 1.8. "License" diff --git a/externals/ffmpeg/CMakeLists.txt b/externals/ffmpeg/CMakeLists.txt index f2886eb6c..543585d4f 100644 --- a/externals/ffmpeg/CMakeLists.txt +++ b/externals/ffmpeg/CMakeLists.txt @@ -138,7 +138,7 @@ if (NOT WIN32 AND NOT ANDROID) --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android- --sysroot=${SYSROOT} --target-os=android - --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" + --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" --extra-ldflags="-nostdlib" ) endif() |