Merge pull request #5064 from nulano/gha

Update FriBiDi to 1.0.10
This commit is contained in:
Hugo van Kemenade 2020-11-26 21:20:59 +02:00 committed by GitHub
commit 6a9c5fc608
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions

View File

@ -287,9 +287,9 @@ deps = {
"libs": [r"*.lib"], "libs": [r"*.lib"],
}, },
"fribidi": { "fribidi": {
"url": "https://github.com/fribidi/fribidi/archive/v1.0.9.zip", "url": "https://github.com/fribidi/fribidi/archive/v1.0.10.zip",
"filename": "fribidi-1.0.9.zip", "filename": "fribidi-1.0.10.zip",
"dir": "fribidi-1.0.9", "dir": "fribidi-1.0.10",
"build": [ "build": [
cmd_copy(r"{winbuild_dir}\fribidi.cmake", r"CMakeLists.txt"), cmd_copy(r"{winbuild_dir}\fribidi.cmake", r"CMakeLists.txt"),
cmd_cmake(), cmd_cmake(),

View File

@ -99,4 +99,4 @@ add_library(fribidi STATIC
${FRIBIDI_SOURCES_GENERATED}) ${FRIBIDI_SOURCES_GENERATED})
fribidi_definitions(fribidi) fribidi_definitions(fribidi)
target_compile_definitions(fribidi target_compile_definitions(fribidi
PUBLIC -DFRIBIDI_ENTRY=extern) PUBLIC -DFRIBIDI_LIB_STATIC)

View File

@ -7,7 +7,7 @@ find_library(fribidi NAMES fribidi)
find_library(harfbuzz NAMES harfbuzz) find_library(harfbuzz NAMES harfbuzz)
find_library(freetype NAMES freetype) find_library(freetype NAMES freetype)
add_definitions(-DFRIBIDI_ENTRY=extern) add_definitions(-DFRIBIDI_LIB_STATIC)
function(raqm_conf) function(raqm_conf)