Browse Source
[cmake] partial audio_core fix
Signed-off-by: crueter <crueter@eden-emu.dev>
pull/143/head
crueter
8 months ago
No known key found for this signature in database
GPG Key ID: 425ACD2D4830EBC6
6 changed files with
6 additions and
3 deletions
-
CMakeLists.txt
-
src/audio_core/CMakeLists.txt
-
src/audio_core/adsp/apps/opus/opus_decode_object.h
-
src/audio_core/adsp/apps/opus/opus_multistream_decode_object.h
-
src/audio_core/opus/hardware_opus.h
-
src/core/CMakeLists.txt
|
|
@ -411,6 +411,7 @@ find_package(stb MODULE) |
|
|
find_package(VulkanMemoryAllocator CONFIG) |
|
|
find_package(VulkanMemoryAllocator CONFIG) |
|
|
find_package(ZLIB 1.2 REQUIRED) |
|
|
find_package(ZLIB 1.2 REQUIRED) |
|
|
find_package(zstd 1.5 REQUIRED) |
|
|
find_package(zstd 1.5 REQUIRED) |
|
|
|
|
|
find_package(Opus 1.3 MODULE) |
|
|
|
|
|
|
|
|
# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) |
|
|
# if (NOT YUZU_USE_EXTERNAL_VULKAN_HEADERS) |
|
|
# find_package(VulkanHeaders 1.3.274 REQUIRED) |
|
|
# find_package(VulkanHeaders 1.3.274 REQUIRED) |
|
|
|
|
|
@ -226,6 +226,7 @@ else() |
|
|
) |
|
|
) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
target_include_directories(audio_core PRIVATE ${OPUS_INCLUDE_DIRS}) |
|
|
target_link_libraries(audio_core PUBLIC common core opus) |
|
|
target_link_libraries(audio_core PUBLIC common core opus) |
|
|
|
|
|
|
|
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) |
|
|
if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) |
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
|
|
|
|
|
#pragma once |
|
|
#pragma once |
|
|
|
|
|
|
|
|
#include <opus/opus.h> |
|
|
|
|
|
|
|
|
#include <opus.h> |
|
|
|
|
|
|
|
|
#include "common/common_types.h" |
|
|
#include "common/common_types.h" |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
|
|
|
|
|
#pragma once |
|
|
#pragma once |
|
|
|
|
|
|
|
|
#include <opus/opus_multistream.h> |
|
|
|
|
|
|
|
|
#include <opus_multistream.h> |
|
|
|
|
|
|
|
|
#include "common/common_types.h" |
|
|
#include "common/common_types.h" |
|
|
|
|
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
#pragma once |
|
|
#pragma once |
|
|
|
|
|
|
|
|
#include <mutex> |
|
|
#include <mutex> |
|
|
#include <opus/opus.h> |
|
|
|
|
|
|
|
|
#include <opus.h> |
|
|
|
|
|
|
|
|
#include "audio_core/adsp/apps/opus/opus_decoder.h" |
|
|
#include "audio_core/adsp/apps/opus/opus_decoder.h" |
|
|
#include "audio_core/adsp/apps/opus/shared_memory.h" |
|
|
#include "audio_core/adsp/apps/opus/shared_memory.h" |
|
|
|
|
|
@ -1184,6 +1184,7 @@ else() |
|
|
) |
|
|
) |
|
|
endif() |
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
target_include_directories(core PRIVATE ${OPUS_INCLUDE_DIRS}) |
|
|
target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz) |
|
|
target_link_libraries(core PUBLIC common PRIVATE audio_core hid_core network video_core nx_tzdb tz) |
|
|
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API) |
|
|
target_link_libraries(core PUBLIC Boost::headers PRIVATE fmt::fmt nlohmann_json::nlohmann_json mbedtls RenderDoc::API) |
|
|
if (MINGW) |
|
|
if (MINGW) |
|
|
|