From 1f1c710093f695869e98bef64ccd2df3041d2754 Mon Sep 17 00:00:00 2001 From: Zopolis4 Date: Thu, 8 Sep 2022 14:04:27 +1000 Subject: [PATCH] Remove cubeb submodule --- .gitmodules | 4 ---- CMakeLists.txt | 11 +---------- dependencies/cubeb | 1 - dependencies/vcpkg | 2 +- vcpkg.json | 3 ++- 5 files changed, 4 insertions(+), 17 deletions(-) delete mode 160000 dependencies/cubeb diff --git a/.gitmodules b/.gitmodules index 04f01186..07047bd7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,10 +2,6 @@ path = dependencies/ZArchive url = https://github.com/Exzap/ZArchive shallow = true -[submodule "dependencies/cubeb"] - path = dependencies/cubeb - url = https://github.com/mozilla/cubeb - shallow = true [submodule "dependencies/vcpkg"] path = dependencies/vcpkg url = https://github.com/microsoft/vcpkg diff --git a/CMakeLists.txt b/CMakeLists.txt index cfd31dea..43ee1429 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,16 +123,7 @@ if (ENABLE_WXWIDGETS) endif() if (ENABLE_CUBEB) - find_package(cubeb) - 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$<$:Debug>") - add_library(cubeb::cubeb ALIAS cubeb) - endif() + find_package(cubeb REQUIRED) add_compile_definitions("HAS_CUBEB=1") endif() diff --git a/dependencies/cubeb b/dependencies/cubeb deleted file mode 160000 index dc511c6b..00000000 --- a/dependencies/cubeb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit dc511c6b3597b6384d28949285b9289e009830ea diff --git a/dependencies/vcpkg b/dependencies/vcpkg index 1b0252ca..a291bcad 160000 --- a/dependencies/vcpkg +++ b/dependencies/vcpkg @@ -1 +1 @@ -Subproject commit 1b0252ca70ca2244a711535462c7f981eb439e83 +Subproject commit a291bcad8093f9f17988fe66543aefd674812f0e diff --git a/vcpkg.json b/vcpkg.json index 3d781f07..5464205c 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,7 +1,7 @@ { "name": "cemu", "version-string": "1.0", - "builtin-baseline": "1b0252ca70ca2244a711535462c7f981eb439e83", + "builtin-baseline": "a291bcad8093f9f17988fe66543aefd674812f0e", "dependencies": [ "imgui", "pugixml", @@ -14,6 +14,7 @@ }, "rapidjson", "sdl2", + "cubeb", "boost-tokenizer", "boost-container", "boost-program-options",