From d001904cbedd958e002764f0dd8126608536284f Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 10 Dec 2024 08:59:07 -0300 Subject: [PATCH] Miniaudio submodule on dev branch. --- .gitmodules | 3 +++ UnleashedRecomp/CMakeLists.txt | 3 ++- thirdparty/miniaudio | 1 + vcpkg.json | 3 +-- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 160000 thirdparty/miniaudio diff --git a/.gitmodules b/.gitmodules index 2d13581c..46232bb5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "UnleashedRecompResources"] path = UnleashedRecompResources url = https://github.com/hedge-dev/UnleashedRecompResources.git +[submodule "thirdparty/miniaudio"] + path = thirdparty/miniaudio + url = https://github.com/mackron/miniaudio diff --git a/UnleashedRecomp/CMakeLists.txt b/UnleashedRecomp/CMakeLists.txt index 00455941..6c1540f6 100644 --- a/UnleashedRecomp/CMakeLists.txt +++ b/UnleashedRecomp/CMakeLists.txt @@ -162,6 +162,8 @@ set_source_files_properties(${LIBMSPACK_C_SOURCES} PROPERTIES SKIP_PRECOMPILE_HE set(SMOLV_SOURCE_DIR "${SWA_THIRDPARTY_ROOT}/ShaderRecomp/thirdparty/smol-v/source") set(BC_DIFF_SOURCE_DIR "${SWA_TOOLS_ROOT}/bc_diff") +set(MINIAUDIO_INCLUDE_DIRS "${SWA_THIRDPARTY_ROOT}/miniaudio") + set(SWA_USER_CXX_SOURCES "user/achievement_data.cpp" "user/config.cpp" @@ -219,7 +221,6 @@ find_package(imgui CONFIG REQUIRED) find_package(magic_enum CONFIG REQUIRED) find_package(unofficial-tiny-aes-c CONFIG REQUIRED) find_package(nfd CONFIG REQUIRED) -find_path(MINIAUDIO_INCLUDE_DIRS "miniaudio.h") file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/D3D12) add_custom_command(TARGET UnleashedRecomp POST_BUILD diff --git a/thirdparty/miniaudio b/thirdparty/miniaudio new file mode 160000 index 00000000..12a8d4e4 --- /dev/null +++ b/thirdparty/miniaudio @@ -0,0 +1 @@ +Subproject commit 12a8d4e4911c5ab4f4c089b4d039433975ed8a66 diff --git a/vcpkg.json b/vcpkg.json index d778cb96..5b42e039 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -22,7 +22,6 @@ "features": [ "sdl2-binding" ] }, "magic-enum", - "nativefiledialog-extended", - "miniaudio" + "nativefiledialog-extended" ] }