diff --git a/CMakeLists.txt b/CMakeLists.txt index 223810cd..63d3858f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ if (ANDROID) if (TTF_WITH_HARFBUZZ) set(HARFBUZZ_INCLUDE_DIRS ../../external/harfbuzz-2.3.1/src) set(HARFBUZZ_LIBRARIES harfbuzz) - set(FREETYPE_INCLUDE_DIRS ../../external/freetype-2.9.1/include) + set(FREETYPE_INCLUDE_DIRS ../../external/freetype-2.10.1/include) set(FREETYPE_LIBRARY freetype) add_definitions("-DTTF_USE_HARFBUZZ=1") @@ -32,8 +32,8 @@ if (ANDROID) set(FT_WITH_HARFBUZZ OFF CACHE BOOL "" FORCE) endif() - add_subdirectory(external/freetype-2.9.1) - include_directories(external/freetype-2.9.1/include) + add_subdirectory(external/freetype-2.10.1) + include_directories(external/freetype-2.10.1/include) target_include_directories(SDL2_ttf PUBLIC .) target_link_libraries(SDL2_ttf PRIVATE freetype SDL2) diff --git a/external/harfbuzz-2.3.1/Android.mk b/external/harfbuzz-2.3.1/Android.mk index 550199cf..f358b945 100644 --- a/external/harfbuzz-2.3.1/Android.mk +++ b/external/harfbuzz-2.3.1/Android.mk @@ -57,7 +57,7 @@ LOCAL_C_INCLUDES = \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/src/ \ $(LOCAL_PATH)/src/hb-ucdn/ \ - $(LOCAL_PATH)/../freetype-2.9.1/include/ \ + $(LOCAL_PATH)/../freetype-2.10.1/include/ \ #LOCAL_CFLAGS += -DHB_NO_MT -DHAVE_OT -DHAVE_UCDN -fPIC