summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Liam2024-01-08 09:34:16 -0500
committerGravatar Liam2024-01-08 09:34:32 -0500
commit4f83b00f6f98cff94ccdec7bbcd664e576bd878e (patch)
tree0180d0b8639ffed3953886097586dfb3e8dd6fcd
parentMerge pull request #12608 from szepeviktor/typos (diff)
downloadyuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.gz
yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.tar.xz
yuzu-4f83b00f6f98cff94ccdec7bbcd664e576bd878e.zip
general: fix trailing whitespace
Diffstat (limited to '')
-rw-r--r--.ci/scripts/linux/exec.sh2
-rw-r--r--LICENSES/BSD-2-Clause.txt2
-rw-r--r--LICENSES/BSD-3-Clause.txt2
-rw-r--r--LICENSES/MPL-2.0.txt2
-rw-r--r--externals/ffmpeg/CMakeLists.txt2
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
9sudo chown -R 1027 ./ 9sudo chown -R 1027 ./
10 10
11# The environment variables listed below: 11# The environment variables listed below:
12# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION 12# AZURECIREPO TITLEBARFORMATIDLE TITLEBARFORMATRUNNING DISPLAYVERSION
13# are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps 13# are requested in src/common/CMakeLists.txt and appear to be provided somewhere in Azure DevOps
14 14
15docker 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" 15docker 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 @@
1Copyright (c) <year> <owner> 1Copyright (c) <year> <owner>
2 2
3Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 3Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4 4
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 @@
1Copyright (c) <year> <owner>. 1Copyright (c) <year> <owner>.
2 2
3Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: 3Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
4 4
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
35 means any form of the work other than Source Code Form. 35 means any form of the work other than Source Code Form.
36 36
371.7. "Larger Work" 371.7. "Larger Work"
38 means a work that combines Covered Software with other material, in 38 means a work that combines Covered Software with other material, in
39 a separate file or files, that is not Covered Software. 39 a separate file or files, that is not Covered Software.
40 40
411.8. "License" 411.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)
138 --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android- 138 --cross-prefix=${TOOLCHAIN}/bin/aarch64-linux-android-
139 --sysroot=${SYSROOT} 139 --sysroot=${SYSROOT}
140 --target-os=android 140 --target-os=android
141 --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld" 141 --extra-ldflags="--ld-path=${TOOLCHAIN}/bin/ld.lld"
142 --extra-ldflags="-nostdlib" 142 --extra-ldflags="-nostdlib"
143 ) 143 )
144 endif() 144 endif()