yuzu-emu
/
sudachi
mirror of https://github.com/sudachi-emu/sudachi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #48 from sudachi-emu/hotfix-cubeb-nx_tzdb 

Fixed cubeb, nx_to_tzdb and reverted FFmpeg and SDL2
This commit is contained in:
Jarrod Norwell 2024-04-10 16:32:19 +08:00 committed by GitHub
parent 0b88257f43 05d358ccf2
commit 03a29a2dcc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.gitmodules vendored
View File

@ -1,9 +1,6 @@
[submodule "enet"] [submodule "enet"]
path = externals/enet path = externals/enet
url = https://github.com/lsalzman/enet.git url = https://github.com/lsalzman/enet.git
[submodule "cubeb"]
path = externals/cubeb
url = https://github.com/mozilla/cubeb.git
[submodule "dynarmic"] [submodule "dynarmic"]
path = externals/dynarmic path = externals/dynarmic
url = https://github.com/sudachi-emu/dynarmic.git url = https://github.com/sudachi-emu/dynarmic.git
@ -43,9 +40,6 @@
[submodule "libadrenotools"] [submodule "libadrenotools"]
path = externals/libadrenotools path = externals/libadrenotools
url = https://github.com/bylaws/libadrenotools.git url = https://github.com/bylaws/libadrenotools.git
[submodule "tzdb_to_nx"]
path = externals/nx_tzdb/tzdb_to_nx
url = https://github.com/lat9nq/tzdb_to_nx.git
[submodule "VulkanMemoryAllocator"] [submodule "VulkanMemoryAllocator"]
path = externals/VulkanMemoryAllocator path = externals/VulkanMemoryAllocator
url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git
@ -64,3 +58,9 @@
[submodule "vcpkg"] [submodule "vcpkg"]
path = externals/vcpkg path = externals/vcpkg
url = https://github.com/microsoft/vcpkg.git url = https://github.com/microsoft/vcpkg.git
[submodule "externals/nx_tzdb/tzdb_to_nx"]
path = externals/nx_tzdb/tzdb_to_nx
url = https://github.com/lat9nq/tzdb_to_nx.git
[submodule "externals/cubeb"]
path = externals/cubeb
url = https://github.com/mozilla/cubeb.git

2
externals/SDL vendored

@ -1 +1 @@
Subproject commit d79f8652510b8bd1f89c90be2ab65fc8940056eb Subproject commit cc016b0046d563287f0aa9f09b958b5e70d43696

2
externals/cubeb vendored

@ -1 +1 @@
Subproject commit 74d6b0546576d9ee13a078ed51f87a6eede62014 Subproject commit 67db4cbc18581c8a6d8ea935af9854ed9729e7a7

2
externals/ffmpeg/ffmpeg vendored

@ -1 +1 @@
Subproject commit d65908c3d416e331e075c3a5ffe7bc670112a018 Subproject commit 9c1294eaddb88cb0e044c675ccae059a85fc9c6c

4
src/android/build.gradle.kts
View File

@ -3,8 +3,8 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules. // Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins { plugins {
id("com.android.application") version "8.3.0" apply false id("com.android.application") version "8.3.1" apply false
id("com.android.library") version "8.3.0" apply false id("com.android.library") version "8.3.1" apply false
id("org.jetbrains.kotlin.android") version "1.9.20" apply false id("org.jetbrains.kotlin.android") version "1.9.20" apply false
} }