diff options
| author | Timothy Flynn <trflynn89@pm.me> | 2023-03-01 08:43:22 -0500 |
|---|---|---|
| committer | Linus Groh <mail@linusgroh.de> | 2023-03-01 14:54:16 +0000 |
| commit | fd1fbad1d26f59c8b1cb142c84b367d3acbd2299 (patch) | |
| tree | f351345edec940338d13bb7a23cbb6ae0b36fa12 /Meta/CMake | |
| parent | fb6ca386cc0bd65712b976f7fc004555ba72fb30 (diff) | |
| download | serenity-fd1fbad1d26f59c8b1cb142c84b367d3acbd2299.zip | |
LibGfx+LibUnicode: Support specifying the path to search for emoji
Similar to the FontDatabase, this will be needed for Ladybird to find
emoji images. We now generate just the file name of emoji image in
LibUnicode, and look for that file in the specified path (defaulting to
/res/emoji) at runtime.
Diffstat (limited to 'Meta/CMake')
| -rw-r--r-- | Meta/CMake/unicode_data.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Meta/CMake/unicode_data.cmake b/Meta/CMake/unicode_data.cmake index 680ebdaa4b..dc97c6362b 100644 --- a/Meta/CMake/unicode_data.cmake +++ b/Meta/CMake/unicode_data.cmake @@ -64,8 +64,7 @@ set(SENTENCE_BREAK_PROP_PATH "${UCD_PATH}/${SENTENCE_BREAK_PROP_SOURCE}") string(REGEX REPLACE "([0-9]+\\.[0-9]+)\\.[0-9]+" "\\1" EMOJI_VERSION "${UCD_VERSION}") set(EMOJI_TEST_URL "https://www.unicode.org/Public/emoji/${EMOJI_VERSION}/emoji-test.txt") set(EMOJI_TEST_PATH "${UCD_PATH}/emoji-test.txt") -set(EMOJI_BASE_PATH "${SerenityOS_SOURCE_DIR}/Base") -set(EMOJI_RES_PATH "${EMOJI_BASE_PATH}/res/emoji") +set(EMOJI_RES_PATH "${SerenityOS_SOURCE_DIR}/Base/res/emoji") set(EMOJI_SERENITY_PATH "${SerenityOS_SOURCE_DIR}/Base/home/anon/Documents/emoji-serenity.txt") set(EMOJI_INSTALL_PATH "${CMAKE_BINARY_DIR}/Root/home/anon/Documents/emoji.txt") @@ -118,7 +117,7 @@ if (ENABLE_UNICODE_DATABASE_DOWNLOAD) "${UCD_VERSION_FILE}" "${EMOJI_DATA_HEADER}" "${EMOJI_DATA_IMPLEMENTATION}" - arguments "${EMOJI_INSTALL_ARG}" -e "${EMOJI_TEST_PATH}" -s "${EMOJI_SERENITY_PATH}" -b "${EMOJI_BASE_PATH}" -r "${EMOJI_RES_PATH}" + arguments "${EMOJI_INSTALL_ARG}" -e "${EMOJI_TEST_PATH}" -s "${EMOJI_SERENITY_PATH}" -r "${EMOJI_RES_PATH}" # This will make this command only run when the modified time of the directory changes, # which only happens if files within it are added or deleted, but not when a file is modified. |