mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-01-30 15:32:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use Skia freetype & harfbuzz when LAF_BACKEND=skia

Browse Source
This commit is contained in:
David Capello 2021-12-01 18:14:18 -03:00
parent 3c7b344389
commit de768a020d
3 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -266,7 +266,7 @@ include_directories(${PIXMAN_INCLUDE_DIR})
# freetype # freetype
if(USE_SHARED_FREETYPE) if(USE_SHARED_FREETYPE)
find_package(Freetype REQUIRED) find_package(Freetype REQUIRED)
else() elseif(NOT LAF_BACKEND STREQUAL "skia")
set(FREETYPE_FOUND ON) set(FREETYPE_FOUND ON)
set(FREETYPE_LIBRARY freetype) set(FREETYPE_LIBRARY freetype)
set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY}) set(FREETYPE_LIBRARIES ${FREETYPE_LIBRARY})
@ -277,11 +277,9 @@ include_directories(${FREETYPE_INCLUDE_DIRS})
# harfbuzz # harfbuzz
if(USE_SHARED_HARFBUZZ) if(USE_SHARED_HARFBUZZ)
find_package(HarfBuzz) find_package(HarfBuzz)
else() elseif(NOT LAF_BACKEND STREQUAL "skia")
if(NOT LAF_BACKEND STREQUAL "skia") set(HARFBUZZ_LIBRARIES harfbuzz)
set(HARFBUZZ_LIBRARIES harfbuzz) set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_DIR}/src)
set(HARFBUZZ_INCLUDE_DIRS ${HARFBUZZ_DIR}/src)
endif()
endif() endif()
include_directories(${HARFBUZZ_INCLUDE_DIRS}) include_directories(${HARFBUZZ_INCLUDE_DIRS})
@ -341,16 +339,6 @@ set(LAF_WITH_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable LAF tests")
set(UNDO_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable undo tests") set(UNDO_TESTS ${ENABLE_TESTS} CACHE BOOL "Enable undo tests")
add_subdirectory(laf) add_subdirectory(laf)
# Use the Skia harfbuzz (it's a modified version with C++11 mutexes).
if(LAF_BACKEND STREQUAL "skia")
add_definitions(-DHAVE_CONFIG_OVERRIDE_H=1)
set(HARFBUZZ_LIBRARIES ${SKIA_HARFBUZZ_LIBRARY})
set(HARFBUZZ_INCLUDE_DIRS
${SKIA_DIR}/third_party/harfbuzz
${SKIA_DIR}/third_party/externals/harfbuzz/src)
endif()
add_subdirectory(src) add_subdirectory(src)
###################################################################### ######################################################################

2
laf

@ -1 +1 @@
Subproject commit 31ba3f99f17ba1ce7eeef6ad75b6d12396f34b04 Subproject commit e1d2d23413e9028bfa6f0b08b74d9c57b3eed4a6

2
third_party/CMakeLists.txt vendored
View File

@ -79,7 +79,7 @@ if(NOT USE_SHARED_PIXMAN)
add_subdirectory(pixman-cmake) add_subdirectory(pixman-cmake)
endif() endif()
if(NOT USE_SHARED_FREETYPE) if(NOT USE_SHARED_FREETYPE AND NOT LAF_BACKEND STREQUAL "skia")
set(SKIP_INSTALL_ALL on) set(SKIP_INSTALL_ALL on)
set(WITH_BZip2 OFF CACHE BOOL "") set(WITH_BZip2 OFF CACHE BOOL "")