diff --git a/dep/cubeb/CMakeLists.txt b/dep/cubeb/CMakeLists.txt
index d2ea60903..28dd25c9c 100644
--- a/dep/cubeb/CMakeLists.txt
+++ b/dep/cubeb/CMakeLists.txt
@@ -9,7 +9,6 @@ option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
option(BUILD_RUST_LIBS "Build rust backends" OFF)
option(BUNDLE_SPEEX "Bundle the speex library" OFF)
option(LAZY_LOAD_LIBS "Lazily load shared libraries" ON)
-option(USE_SANITIZERS "Use sanitizers" ON)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING
@@ -20,19 +19,6 @@ set(CMAKE_C_STANDARD 99)
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
-if(USE_SANITIZERS)
- if(NOT COMMAND add_sanitizers)
- list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/sanitizers-cmake/cmake")
- find_package(Sanitizers)
- if(NOT COMMAND add_sanitizers)
- message(FATAL_ERROR "Could not find sanitizers-cmake: run\n\tgit submodule update --init --recursive\nin base git checkout")
- endif()
- endif()
-else()
- macro(add_sanitizers UNUSED)
- endmacro()
-endif()
-
if (BUILD_RUST_LIBS)
if(EXISTS "${PROJECT_SOURCE_DIR}/src/cubeb-pulse-rs")
set(USE_PULSE_RUST 1)
@@ -74,8 +60,6 @@ set_target_properties(cubeb PROPERTIES
SOVERSION ${cubeb_VERSION_MAJOR}
)
-add_sanitizers(cubeb)
-
include(GenerateExportHeader)
generate_export_header(cubeb EXPORT_FILE_NAME ${CMAKE_BINARY_DIR}/exports/cubeb_export.h)
target_include_directories(cubeb
diff --git a/dep/cubeb/cubeb.vcxproj b/dep/cubeb/cubeb.vcxproj
index 846faedd8..fb85f7502 100644
--- a/dep/cubeb/cubeb.vcxproj
+++ b/dep/cubeb/cubeb.vcxproj
@@ -17,13 +17,13 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -34,28 +34,24 @@
-
+
{72F9423C-91EE-4487-AAC6-555ED6F61AA1}
-
-
TurnOffAllWarnings
USE_WASAPI;USE_WINMM;OUTSIDE_SPEEX;FLOATING_POINT;RANDOM_PREFIX=speex;EXPORT=;%(PreprocessorDefinitions)
- $(ProjectDir)include;$(ProjectDir)src;%(AdditionalIncludeDirectories)
+ $(ProjectDir)include;$(ProjectDir)src;$(ProjectDir)subprojects;%(AdditionalIncludeDirectories)
stdcpp14
-
ksuser.lib;%(AdditionalDependencies)
-
\ No newline at end of file
diff --git a/dep/cubeb/cubeb.vcxproj.filters b/dep/cubeb/cubeb.vcxproj.filters
index 3d0a6d76c..fb1f35919 100644
--- a/dep/cubeb/cubeb.vcxproj.filters
+++ b/dep/cubeb/cubeb.vcxproj.filters
@@ -2,27 +2,6 @@
-
- speex
-
-
- speex
-
-
- speex
-
-
- speex
-
-
- speex
-
-
- speex
-
-
- speex
-
@@ -37,6 +16,27 @@
+
+ speex
+
+
+ speex
+
+
+ speex
+
+
+ speex
+
+
+ speex
+
+
+ speex
+
+
+ speex
+
@@ -44,9 +44,6 @@
-
- speex
-
@@ -55,5 +52,8 @@
+
+ speex
+
\ No newline at end of file
diff --git a/dep/cubeb/src/speex/arch.h b/dep/cubeb/subprojects/speex/arch.h
similarity index 100%
rename from dep/cubeb/src/speex/arch.h
rename to dep/cubeb/subprojects/speex/arch.h
diff --git a/dep/cubeb/src/speex/fixed_generic.h b/dep/cubeb/subprojects/speex/fixed_generic.h
similarity index 100%
rename from dep/cubeb/src/speex/fixed_generic.h
rename to dep/cubeb/subprojects/speex/fixed_generic.h
diff --git a/dep/cubeb/src/speex/resample.c b/dep/cubeb/subprojects/speex/resample.c
similarity index 100%
rename from dep/cubeb/src/speex/resample.c
rename to dep/cubeb/subprojects/speex/resample.c
diff --git a/dep/cubeb/src/speex/resample_neon.h b/dep/cubeb/subprojects/speex/resample_neon.h
similarity index 100%
rename from dep/cubeb/src/speex/resample_neon.h
rename to dep/cubeb/subprojects/speex/resample_neon.h
diff --git a/dep/cubeb/src/speex/resample_sse.h b/dep/cubeb/subprojects/speex/resample_sse.h
similarity index 100%
rename from dep/cubeb/src/speex/resample_sse.h
rename to dep/cubeb/subprojects/speex/resample_sse.h
diff --git a/dep/cubeb/src/speex/speex_config_types.h b/dep/cubeb/subprojects/speex/speex_config_types.h
similarity index 100%
rename from dep/cubeb/src/speex/speex_config_types.h
rename to dep/cubeb/subprojects/speex/speex_config_types.h
diff --git a/dep/cubeb/src/speex/speex_resampler.h b/dep/cubeb/subprojects/speex/speex_resampler.h
similarity index 100%
rename from dep/cubeb/src/speex/speex_resampler.h
rename to dep/cubeb/subprojects/speex/speex_resampler.h
diff --git a/dep/cubeb/src/speex/stack_alloc.h b/dep/cubeb/subprojects/speex/stack_alloc.h
similarity index 100%
rename from dep/cubeb/src/speex/stack_alloc.h
rename to dep/cubeb/subprojects/speex/stack_alloc.h