mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2026-05-26 13:50:37 +00:00
Submodules update (#4026)
* added openal-soft , cpp-httplib * CLI11,sdl3 update
This commit is contained in:
@@ -126,3 +126,10 @@
|
||||
path = externals/sdl3
|
||||
url = https://github.com/shadexternals/sdl3.git
|
||||
|
||||
branch = main
|
||||
[submodule "externals/cpp-httplib"]
|
||||
path = externals/cpp-httplib
|
||||
url = https://github.com/shadexternals/cpp-httplib.git
|
||||
[submodule "externals/openal-soft"]
|
||||
path = externals/openal-soft
|
||||
url = https://github.com/shadexternals/openal-soft.git
|
||||
|
||||
+2
-1
@@ -228,6 +228,7 @@ find_package(glslang 15 CONFIG)
|
||||
find_package(half 1.12.0 MODULE)
|
||||
find_package(magic_enum 0.9.7 CONFIG)
|
||||
find_package(PNG 1.6 MODULE)
|
||||
find_package(OpenAL CONFIG)
|
||||
find_package(RenderDoc 1.6.0 MODULE)
|
||||
find_package(SDL3_mixer 2.8.1 CONFIG)
|
||||
if (SDL3_mixer_FOUND)
|
||||
@@ -1115,7 +1116,7 @@ create_target_directory_groups(shadps4)
|
||||
|
||||
target_link_libraries(shadps4 PRIVATE magic_enum::magic_enum fmt::fmt toml11::toml11 tsl::robin_map xbyak::xbyak Tracy::TracyClient RenderDoc::API FFmpeg::ffmpeg Dear_ImGui gcn half::half ZLIB::ZLIB PNG::PNG)
|
||||
target_link_libraries(shadps4 PRIVATE Boost::headers GPUOpen::VulkanMemoryAllocator LibAtrac9 sirit Vulkan::Headers xxHash::xxhash Zydis::Zydis glslang::glslang SDL3::SDL3 SDL3_mixer::SDL3_mixer pugixml::pugixml)
|
||||
target_link_libraries(shadps4 PRIVATE stb::headers libusb::usb lfreist-hwinfo::hwinfo nlohmann_json::nlohmann_json miniz fdk-aac CLI11::CLI11)
|
||||
target_link_libraries(shadps4 PRIVATE stb::headers libusb::usb lfreist-hwinfo::hwinfo nlohmann_json::nlohmann_json miniz fdk-aac CLI11::CLI11 OpenAL::OpenAL Cpp_Httplib)
|
||||
|
||||
target_compile_definitions(shadps4 PRIVATE IMGUI_USER_CONFIG="imgui/imgui_config.h")
|
||||
target_compile_definitions(Dear_ImGui PRIVATE IMGUI_USER_CONFIG="${PROJECT_SOURCE_DIR}/src/imgui/imgui_config.h")
|
||||
|
||||
Vendored
+1
-1
Submodule externals/CLI11 updated: bf5a16a26a...617af27227
Vendored
+38
@@ -276,3 +276,41 @@ if (NOT TARGET CLI11::CLI11)
|
||||
set(CLI11_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||
add_subdirectory(CLI11)
|
||||
endif()
|
||||
|
||||
|
||||
#openal
|
||||
if (NOT TARGET OpenAL::OpenAL)
|
||||
set(ALSOFT_ENABLE_MODULES OFF CACHE BOOL "" FORCE)
|
||||
set(LIBTYPE "STATIC" CACHE STRING "" FORCE)
|
||||
# Disable everything we don't need
|
||||
set(ALSOFT_UTILS OFF CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_EXAMPLES OFF CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_TESTS OFF CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_INSTALL OFF CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_CONFIG OFF CACHE BOOL "" FORCE)
|
||||
|
||||
# Backends (platform-specific)
|
||||
if (WIN32)
|
||||
set(ALSOFT_BACKEND_WASAPI ON CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_BACKEND_DSOUND OFF CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_BACKEND_WINMM OFF CACHE BOOL "" FORCE)
|
||||
elseif (APPLE)
|
||||
set(ALSOFT_BACKEND_COREAUDIO ON CACHE BOOL "" FORCE)
|
||||
else()
|
||||
set(ALSOFT_BACKEND_ALSA ON CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_BACKEND_PULSEAUDIO ON CACHE BOOL "" FORCE)
|
||||
set(ALSOFT_BACKEND_PIPEWIRE OFF CACHE BOOL "" FORCE)
|
||||
endif()
|
||||
# Headless-safe
|
||||
set(ALSOFT_BACKEND_NULL ON CACHE BOOL "" FORCE)
|
||||
|
||||
# Static build
|
||||
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
|
||||
|
||||
add_subdirectory(openal-soft EXCLUDE_FROM_ALL)
|
||||
endif()
|
||||
|
||||
# cpp-httplib
|
||||
add_library(Cpp_Httplib INTERFACE)
|
||||
target_include_directories(Cpp_Httplib INTERFACE cpp-httplib/)
|
||||
|
||||
|
||||
+1
Submodule externals/cpp-httplib added at f80864ca03
+1
Submodule externals/openal-soft added at f120be6e2e
Vendored
+1
-1
Submodule externals/sdl3 updated: bdb72bb3f0...4e2fd57e77
Reference in New Issue
Block a user