From 3de4c3e32ee6304eb46eee01e1b373cefdac207d Mon Sep 17 00:00:00 2001 From: sspacelynx <37104290+sspacelynx@users.noreply.github.com> Date: Wed, 14 Jul 2021 16:28:02 +0200 Subject: [PATCH] Add Opus submodule --- .gitmodules | 3 +++ app/CMakeLists.txt | 6 +++++- app/libraries/opus | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) create mode 160000 app/libraries/opus diff --git a/.gitmodules b/.gitmodules index 238645a9..dd61965b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -31,3 +31,6 @@ [submodule "app/libraries/mbedtls"] path = app/libraries/mbedtls url = https://github.com/ARMmbed/mbedtls +[submodule "app/libraries/opus"] + path = app/libraries/opus + url = https://github.com/xiph/opus diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 1a65191c..180176b3 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -59,6 +59,10 @@ set(UNSAFE_BUILD ON CACHE BOOL "Allow unsafe builds. These builds ARE NOT SECURE add_subdirectory("libraries/mbedtls") include_directories("libraries/mbedtls/include") +# Opus +add_subdirectory("libraries/opus") +include_directories("libraries/opus/include") + # Perfetto SDK include_directories(libraries/perfetto/sdk) add_library(perfetto STATIC libraries/perfetto/sdk/perfetto.cc) @@ -217,5 +221,5 @@ add_library(skyline SHARED ${source_DIR}/skyline/services/mmnv/IRequest.cpp ) # target_precompile_headers(skyline PRIVATE ${source_DIR}/skyline/common.h) # PCH will currently break Intellisense -target_link_libraries(skyline android perfetto fmt lz4_static tzcode oboe vkma mbedcrypto) +target_link_libraries(skyline android perfetto fmt lz4_static tzcode oboe vkma mbedcrypto opus) target_compile_options(skyline PRIVATE -Wall -Wno-unknown-attributes -Wno-c++20-extensions -Wno-c++17-extensions -Wno-c99-designator -Wno-reorder -Wno-missing-braces -Wno-unused-variable -Wno-unused-private-field) diff --git a/app/libraries/opus b/app/libraries/opus new file mode 160000 index 00000000..6b6035ae --- /dev/null +++ b/app/libraries/opus @@ -0,0 +1 @@ +Subproject commit 6b6035ae4a29abbd237463d84a45fbeb0d92bc18