mirror of
https://github.com/KytyPS5/KytyPS5.git
synced 2026-10-19 18:36:53 +02:00
Emil
05f92b6422
* libs: fix CP932 iconv conversion on Windows and macOS
SDL3's SDL_SYSTEM_ICONV build option defaults off on Windows and macOS,
so SDL falls back to its own bundled iconv there, which only implements
ASCII/Latin-1/UTF/UCS. SDL_iconv_open("UTF-8", "CP932") always failed as
a result, crashing games that convert Shift-JIS strings via
sceCesMbcsStrToUtf8Str (e.g. save-data dialogs).
Add a small CesIconv shim selected at compile time: Windows converts one
character at a time via the Win32 codepage-932 APIs, replicating
SDL_iconv's chunked semantics and error codes; macOS calls real POSIX
iconv directly, since libiconv is always present there and does support
CP932, unlike SDL's fallback. Linux is untouched, since SDL already
links real system iconv by default there.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* libs: fix SaveDataDialog infinite loop on save
SaveDataDialogOpen() jumped straight from SAVE_STATUS_INITIALIZED (1) to
SAVE_STATUS_FINISHED (3), skipping SAVE_STATUS_RUNNING (2) entirely. At
least one title's save-write dialog stage only accepts a FINISHED status
after observing a RUNNING poll first; without it, the title assumed the
Open() request never took effect and re-issued it forever, hanging the
save flow (this only became visible once the CP932 crash above stopped
masking it).
Open() now starts the dialog as RUNNING. UpdateStatus() advances the
state machine, reporting RUNNING once before flipping to FINISHED for
subsequent polls; GetStatus() is untouched, staying a pure peek with no
side effects, matching the real SDK's pump-vs-peek split between the two
calls.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
* Add iconv linking to macOS
* Fix missing macOS iconv link for tests
* Fix CP932 edge cases and save dialog status consistency
---------
Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: nmzik <Nmzik@mail.ru>
148 lines
4.5 KiB
CMake
148 lines
4.5 KiB
CMake
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
|
|
|
|
add_subdirectory(cpuinfo)
|
|
|
|
# The Windows guest red-zone patcher needs a decoder/encoder and a small
|
|
# trampoline assembler. Pin the same revisions used by shadPS4's implementation.
|
|
include(FetchContent)
|
|
|
|
set(XBYAK_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
|
FetchContent_Declare(
|
|
xbyak
|
|
GIT_REPOSITORY https://github.com/herumi/xbyak.git
|
|
GIT_TAG 44a72f369268f7d552650891b296693e91db86bb
|
|
GIT_SHALLOW FALSE
|
|
)
|
|
|
|
set(ZYDIS_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
|
|
set(ZYDIS_BUILD_TOOLS OFF CACHE BOOL "" FORCE)
|
|
set(ZYDIS_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
|
set(ZYDIS_BUILD_DOXYGEN OFF CACHE BOOL "" FORCE)
|
|
FetchContent_Declare(
|
|
zydis
|
|
GIT_REPOSITORY https://github.com/zyantific/zydis.git
|
|
GIT_TAG 120e0e705f8e3b507dc49377ac2879979f0d545c
|
|
GIT_SUBMODULES_RECURSE TRUE
|
|
GIT_SHALLOW FALSE
|
|
)
|
|
|
|
FetchContent_MakeAvailable(xbyak zydis)
|
|
|
|
set(SDL_SHARED OFF CACHE BOOL "" FORCE)
|
|
if(APPLE)
|
|
# SDL's built-in iconv fallback does not support CP932.
|
|
set(SDL_SYSTEM_ICONV ON CACHE BOOL "Use system iconv for CP932 conversion" FORCE)
|
|
endif()
|
|
add_subdirectory(SDL3)
|
|
|
|
add_library(Vulkan-Headers INTERFACE)
|
|
add_library(Vulkan::Headers ALIAS Vulkan-Headers)
|
|
target_include_directories(Vulkan-Headers INTERFACE
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/Vulkan-Headers/include"
|
|
)
|
|
|
|
add_library(imgui STATIC
|
|
imgui/imgui.cpp
|
|
imgui/imgui_draw.cpp
|
|
imgui/imgui_tables.cpp
|
|
imgui/imgui_widgets.cpp
|
|
imgui/backends/imgui_impl_vulkan.cpp
|
|
)
|
|
target_include_directories(imgui PUBLIC
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/imgui"
|
|
"${CMAKE_CURRENT_SOURCE_DIR}/imgui/backends"
|
|
)
|
|
target_compile_definitions(imgui PRIVATE IMGUI_IMPL_VULKAN_NO_PROTOTYPES)
|
|
target_link_libraries(imgui PUBLIC Vulkan::Headers)
|
|
if(MSVC)
|
|
target_compile_options(imgui PRIVATE /W0)
|
|
else()
|
|
target_compile_options(imgui PRIVATE -w)
|
|
endif()
|
|
|
|
set(SPIRV_SKIP_TESTS ON CACHE BOOL "" FORCE)
|
|
set(SPIRV_SKIP_EXECUTABLES ON CACHE BOOL "" FORCE)
|
|
set(SKIP_SPIRV_TOOLS_INSTALL ON CACHE BOOL "" FORCE)
|
|
set(SPIRV_WERROR OFF CACHE BOOL "" FORCE)
|
|
set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/SPIRV-Headers" CACHE PATH "" FORCE)
|
|
add_subdirectory(SPIRV-Tools)
|
|
|
|
add_library(spirv-tools ALIAS SPIRV-Tools-static)
|
|
add_library(spirv-tools-opt ALIAS SPIRV-Tools-opt)
|
|
|
|
add_subdirectory(xxHash/build/cmake)
|
|
|
|
set(FMT_DOC OFF CACHE BOOL "" FORCE)
|
|
set(FMT_INSTALL OFF CACHE BOOL "" FORCE)
|
|
set(FMT_MODULE OFF CACHE BOOL "" FORCE)
|
|
set(FMT_TEST OFF CACHE BOOL "" FORCE)
|
|
add_subdirectory(fmt EXCLUDE_FROM_ALL)
|
|
|
|
set(JSON_BuildTests OFF CACHE BOOL "" FORCE)
|
|
set(JSON_Install OFF CACHE BOOL "" FORCE)
|
|
add_subdirectory(nlohmann_json EXCLUDE_FROM_ALL)
|
|
|
|
set(SPDLOG_BUILD_ALL OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_BUILD_EXAMPLE OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_BUILD_TESTS OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_BUILD_BENCH OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_BUILD_WARNINGS OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_INSTALL OFF CACHE BOOL "" FORCE)
|
|
set(SPDLOG_FMT_EXTERNAL ON CACHE BOOL "" FORCE)
|
|
set(SPDLOG_NO_EXCEPTIONS ON CACHE BOOL "" FORCE)
|
|
if(WIN32)
|
|
set(SPDLOG_WCHAR_FILENAMES ON CACHE BOOL "" FORCE)
|
|
endif()
|
|
add_subdirectory(spdlog EXCLUDE_FROM_ALL)
|
|
|
|
if (NOT TARGET FFmpeg::ffmpeg)
|
|
# On macOS the target arch is driven by CMAKE_OSX_ARCHITECTURES, not the host
|
|
# CMAKE_SYSTEM_PROCESSOR (which reports arm64 even for an x86_64/Rosetta build).
|
|
if(APPLE AND CMAKE_OSX_ARCHITECTURES)
|
|
if(CMAKE_OSX_ARCHITECTURES MATCHES "^(x86_64)$")
|
|
set(ARCHITECTURE x86_64)
|
|
elseif(CMAKE_OSX_ARCHITECTURES MATCHES "^(arm64)$")
|
|
set(ARCHITECTURE arm64)
|
|
else()
|
|
set(ARCHITECTURE x86_64 arm64) # universal
|
|
endif()
|
|
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|ARM64)$")
|
|
set(ARCHITECTURE arm64)
|
|
else()
|
|
set(ARCHITECTURE x86_64)
|
|
endif()
|
|
add_subdirectory(ffmpeg-core)
|
|
add_library(FFmpeg::ffmpeg ALIAS ffmpeg)
|
|
endif()
|
|
|
|
file(GLOB LIBATRAC9_SOURCES LibAtrac9/C/src/*.c)
|
|
add_library(LibAtrac9 STATIC ${LIBATRAC9_SOURCES})
|
|
target_include_directories(LibAtrac9 PUBLIC LibAtrac9/C/src)
|
|
if(MSVC)
|
|
target_compile_options(LibAtrac9 PRIVATE /W0)
|
|
endif()
|
|
|
|
set(TRACY_STATIC ON CACHE BOOL "" FORCE)
|
|
set(TRACY_ENABLE ON CACHE BOOL "" FORCE)
|
|
set(TRACY_ON_DEMAND ON CACHE BOOL "" FORCE)
|
|
set(TRACY_DELAYED_INIT ON CACHE BOOL "" FORCE)
|
|
set(TRACY_MANUAL_LIFETIME ON CACHE BOOL "" FORCE)
|
|
add_subdirectory(tracy EXCLUDE_FROM_ALL)
|
|
if (TARGET TracyClient)
|
|
if (MSVC)
|
|
target_compile_options(TracyClient PRIVATE /WX-)
|
|
endif()
|
|
if (CLANG)
|
|
target_compile_options(TracyClient PRIVATE
|
|
-Wno-error
|
|
-Wno-braced-scalar-init
|
|
-Wno-format
|
|
-Wno-unused-variable
|
|
)
|
|
endif()
|
|
endif()
|
|
|
|
if (CLANG AND MSVC)
|
|
add_subdirectory(winpthread)
|
|
endif()
|