The-Homebrew-Cloud/Cemu
2
0
Fork 0
mirror of https://github.com/cemu-project/Cemu.git synced 2024-12-01 21:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove cubeb submodule

Browse Source
This commit is contained in:
Zopolis4 2022-09-08 14:04:27 +10:00
parent 56d4f2d364
commit 1f1c710093
No known key found for this signature in database
GPG Key ID: C1117D56FBC82774
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitmodules vendored
View File

@ -2,10 +2,6 @@
path = dependencies/ZArchive path = dependencies/ZArchive
url = https://github.com/Exzap/ZArchive url = https://github.com/Exzap/ZArchive
shallow = true shallow = true
[submodule "dependencies/cubeb"]
path = dependencies/cubeb
url = https://github.com/mozilla/cubeb
shallow = true
[submodule "dependencies/vcpkg"] [submodule "dependencies/vcpkg"]
path = dependencies/vcpkg path = dependencies/vcpkg
url = https://github.com/microsoft/vcpkg url = https://github.com/microsoft/vcpkg

11
CMakeLists.txt
View File

@ -123,16 +123,7 @@ if (ENABLE_WXWIDGETS)
endif() endif()
if (ENABLE_CUBEB) if (ENABLE_CUBEB)
find_package(cubeb) find_package(cubeb REQUIRED)
if (NOT cubeb_FOUND)
option(BUILD_TESTS "" OFF)
option(BUILD_TOOLS "" OFF)
option(BUNDLE_SPEEX "" OFF)
set(USE_WINMM OFF CACHE BOOL "")
add_subdirectory("dependencies/cubeb" EXCLUDE_FROM_ALL)
set_property(TARGET cubeb PROPERTY MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
add_library(cubeb::cubeb ALIAS cubeb)
endif()
add_compile_definitions("HAS_CUBEB=1") add_compile_definitions("HAS_CUBEB=1")
endif() endif()

1
dependencies/cubeb vendored

@ -1 +0,0 @@
Subproject commit dc511c6b3597b6384d28949285b9289e009830ea

2
dependencies/vcpkg vendored

@ -1 +1 @@
Subproject commit 1b0252ca70ca2244a711535462c7f981eb439e83 Subproject commit a291bcad8093f9f17988fe66543aefd674812f0e

3
vcpkg.json
View File

@ -1,7 +1,7 @@
{ {
"name": "cemu", "name": "cemu",
"version-string": "1.0", "version-string": "1.0",
"builtin-baseline": "1b0252ca70ca2244a711535462c7f981eb439e83", "builtin-baseline": "a291bcad8093f9f17988fe66543aefd674812f0e",
"dependencies": [ "dependencies": [
"imgui", "imgui",
"pugixml", "pugixml",
@ -14,6 +14,7 @@
}, },
"rapidjson", "rapidjson",
"sdl2", "sdl2",
"cubeb",
"boost-tokenizer", "boost-tokenizer",
"boost-container", "boost-container",
"boost-program-options", "boost-program-options",