Browse Source

Update to SheenBidi v2.9.0

pull/8037/head
Gleb Mazovetskiy 9 months ago
parent
commit
424cbe10dd
  1. 4
      3rdParty/SheenBidi/CMakeLists.txt
  2. 2
      CMake/Dependencies.cmake
  3. 2
      Source/CMakeLists.txt
  4. 4
      Source/utils/utf8.cpp

4
3rdParty/SheenBidi/CMakeLists.txt vendored

@ -6,7 +6,7 @@ set(ASAN OFF)
set(UBSAN OFF) set(UBSAN OFF)
FetchContent_Declare_ExcludeFromAll(SheenBidi FetchContent_Declare_ExcludeFromAll(SheenBidi
URL https://github.com/Tehreer/SheenBidi/archive/c44eb1163c0aac67544862b4fef8d1d3c747f1f0.tar.gz URL https://github.com/Tehreer/SheenBidi/archive/refs/tags/v2.9.0.tar.gz
URL_HASH MD5=2ae98ceaccb6d0be165766c9af1a6c2b URL_HASH MD5=2c22cfad93a52afa7bd25ad56a3a4089
) )
FetchContent_MakeAvailable_ExcludeFromAll(SheenBidi) FetchContent_MakeAvailable_ExcludeFromAll(SheenBidi)

2
CMake/Dependencies.cmake

@ -205,7 +205,7 @@ endif()
add_subdirectory(3rdParty/tl) add_subdirectory(3rdParty/tl)
if(NOT DEFINED DEVILUTIONX_SYSTEM_SHEENBIDI) if(NOT DEFINED DEVILUTIONX_SYSTEM_SHEENBIDI)
find_package(SheenBidi QUIET) find_package(SheenBidi 2.9.0 QUIET)
if(SheenBidi_FOUND) if(SheenBidi_FOUND)
message("-- Found SheenBidi ${SheenBidi_VERSION}") message("-- Found SheenBidi ${SheenBidi_VERSION}")
else() else()

2
Source/CMakeLists.txt

@ -540,7 +540,7 @@ add_devilutionx_object_library(libdevilutionx_utf8
utils/utf8.cpp utils/utf8.cpp
) )
target_link_dependencies(libdevilutionx_utf8 PRIVATE target_link_dependencies(libdevilutionx_utf8 PRIVATE
SheenBidi::sheenbidi SheenBidi::SheenBidi
) )
if(NOSOUND) if(NOSOUND)

4
Source/utils/utf8.cpp

@ -5,9 +5,7 @@
#include <cstring> #include <cstring>
#include <string_view> #include <string_view>
extern "C" { #include <SheenBidi/SheenBidi.h>
#include <SheenBidi.h>
}
namespace devilution { namespace devilution {

Loading…
Cancel
Save