diff options
| author |  Viktor Szépe | 2024-01-16 00:09:00 +0000 |
|---|---|---|
| committer | Viktor Szépe | 2024-01-16 00:09:00 +0000 |
| commit | 90ab89a0b0174f8df559b79dc06a03479d959f93 (patch) | |
| tree | 3d11a790e44945e309f0e68f5332b33b42e72bbb /externals | |
| parent | Fix typos in arrays.xml (diff) | |
| parent | Merge pull request #12681 from t895/stick-toggles (diff) | |
| download | yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.gz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.tar.xz yuzu-90ab89a0b0174f8df559b79dc06a03479d959f93.zip | |
Merge remote-tracking branch 'origin/master' into typos3
Diffstat (limited to 'externals')
| -rw-r--r-- | externals/ffmpeg/CMakeLists.txt | 2 | ||||
| m--------- | externals/nx_tzdb/tzdb_to_nx | 0 |
2 files changed, 1 insertions, 1 deletions
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() |
diff --git a/externals/nx_tzdb/tzdb_to_nx b/externals/nx_tzdb/tzdb_to_nx | |||
| Subproject f6680093bca30265c161581fd813d4ddd33f1e3 | Subproject 404d39004570a26c734a9d1fa29ab4d63089c59 | ||