From 424cbe10dd0d521a5ed69f26a232e166b871e2e2 Mon Sep 17 00:00:00 2001 From: Gleb Mazovetskiy Date: Tue, 10 Jun 2025 17:48:45 +0100 Subject: [PATCH] Update to SheenBidi v2.9.0 --- 3rdParty/SheenBidi/CMakeLists.txt | 4 ++-- CMake/Dependencies.cmake | 2 +- Source/CMakeLists.txt | 2 +- Source/utils/utf8.cpp | 4 +--- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/3rdParty/SheenBidi/CMakeLists.txt b/3rdParty/SheenBidi/CMakeLists.txt index 283b6e71a..0b513b03f 100644 --- a/3rdParty/SheenBidi/CMakeLists.txt +++ b/3rdParty/SheenBidi/CMakeLists.txt @@ -6,7 +6,7 @@ set(ASAN OFF) set(UBSAN OFF) FetchContent_Declare_ExcludeFromAll(SheenBidi - URL https://github.com/Tehreer/SheenBidi/archive/c44eb1163c0aac67544862b4fef8d1d3c747f1f0.tar.gz - URL_HASH MD5=2ae98ceaccb6d0be165766c9af1a6c2b + URL https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.9.0.tar.gz + URL_HASH MD5=2c22cfad93a52afa7bd25ad56a3a4089 ) FetchContent_MakeAvailable_ExcludeFromAll(SheenBidi) diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake index d99355366..004f8059e 100644 --- a/CMake/Dependencies.cmake +++ b/CMake/Dependencies.cmake @@ -205,7 +205,7 @@ endif() add_subdirectory(3rdParty/tl) if(NOT DEFINED DEVILUTIONX_SYSTEM_SHEENBIDI) - find_package(SheenBidi QUIET) + find_package(SheenBidi 2.9.0 QUIET) if(SheenBidi_FOUND) message("-- Found SheenBidi ${SheenBidi_VERSION}") else() diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index 358d8c9ad..70a4f970b 100644 --- a/Source/CMakeLists.txt +++ b/Source/CMakeLists.txt @@ -540,7 +540,7 @@ add_devilutionx_object_library(libdevilutionx_utf8 utils/utf8.cpp ) target_link_dependencies(libdevilutionx_utf8 PRIVATE - SheenBidi::sheenbidi + SheenBidi::SheenBidi ) if(NOSOUND) diff --git a/Source/utils/utf8.cpp b/Source/utils/utf8.cpp index 25e996269..3b62c2214 100644 --- a/Source/utils/utf8.cpp +++ b/Source/utils/utf8.cpp @@ -5,9 +5,7 @@ #include #include -extern "C" { -#include -} +#include namespace devilution {